Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
0aee7c12
Commit
0aee7c12
authored
Mar 02, 2020
by
Cédric Traizet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WRG: silence warning C4251 cause by gdal includes on windows
parent
1ecb0c81
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
2 deletions
+21
-2
Modules/Adapters/GdalAdapters/include/otbSpatialReference.h
Modules/Adapters/GdalAdapters/include/otbSpatialReference.h
+4
-1
Modules/Adapters/GdalAdapters/src/otbCoordinateTransformation.cxx
...Adapters/GdalAdapters/src/otbCoordinateTransformation.cxx
+7
-0
Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx
Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx
+9
-0
Modules/Adapters/GdalAdapters/src/otbSpatialReference.cxx
Modules/Adapters/GdalAdapters/src/otbSpatialReference.cxx
+1
-1
No files found.
Modules/Adapters/GdalAdapters/include/otbSpatialReference.h
View file @
0aee7c12
...
...
@@ -21,7 +21,6 @@
#define otbSpatialReference_h
#include "OTBGdalAdaptersExport.h"
#include "ogr_spatialref.h"
#include <memory>
#include <string>
...
...
@@ -34,6 +33,10 @@
// to have dll-interface to be used by clients of class 'otb::SpatialReference'
// As long as otb::SpatialReference::m_SR is private no need to export this type.
#endif
// causes warning C4251 on Windows
#include "ogr_spatialref.h"
class
OGRSpatialReference
;
namespace
otb
...
...
Modules/Adapters/GdalAdapters/src/otbCoordinateTransformation.cxx
View file @
0aee7c12
...
...
@@ -20,7 +20,14 @@
#include "otbCoordinateTransformation.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4251)
#include "ogr_spatialref.h"
#pragma warning(pop)
#else
#include "ogr_spatialref.h"
#endif
#include <sstream>
#include <stdexcept>
...
...
Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx
View file @
0aee7c12
...
...
@@ -23,7 +23,16 @@
/*===============================[ Includes ]================================*/
/*===========================================================================*/
#include "otbOGRGeometryWrapper.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4251)
#include "ogr_geometry.h"
#pragma warning(pop)
#else
#include "ogr_geometry.h"
#endif
#ifdef _MSC_VER
// warning conversion int -> bool
...
...
Modules/Adapters/GdalAdapters/src/otbSpatialReference.cxx
View file @
0aee7c12
...
...
@@ -20,7 +20,7 @@
#include "otbSpatialReference.h"
#include "ogr_spatialref.h"
#include "cpl_conv.h"
#ifdef __clang__
#pragma clang diagnostic ignored "-Wunused-local-typedefs"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment