From Piotr Gwiazdowski, "So there's config setting OSG_DISABLE_MSVC_WARNINGS which should

disable pragmas that turn off specific warnings for MSVC. Unfortunately it's presence is only checked in osg/Export header, making other Export headers disable warnings no matter what, which is kind of incoherent. My fix adds #include <osg/Config> to every Export header. I've also unified checking whether to disable warnings to current osg/Export way: #if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS). Attachment contains all changed Export files in their original locations."
2011-03-09 14:15:04 +00:00
parent b91741b421
commit d3d0859b4c
14 changed files with 42 additions and 14 deletions
--- a/include/osgAnimation/Export
+++ b/include/osgAnimation/Export
@@ -15,7 +15,9 @@
 #ifndef OSGANIMATION_EXPORT_
 #define OSGANIMATION_EXPORT_ 1

-#if defined(_MSC_VER)
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4267 )
--- a/include/osgDB/Export
+++ b/include/osgDB/Export
@@ -14,7 +14,9 @@
 #ifndef OSGDB_EXPORT_
 #define OSGDB_EXPORT_ 1

-#if defined(_MSC_VER)
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4267 )
--- a/include/osgGA/Export
+++ b/include/osgGA/Export
@@ -15,7 +15,9 @@
 #ifndef OSGGA_EXPORT_
 #define OSGGA_EXPORT_ 1

-#if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__))
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4267 )
--- a/include/osgParticle/Export
+++ b/include/osgParticle/Export
@@ -15,7 +15,9 @@
 #ifndef OSGPARTICLE_EXPORT_
 #define OSGPARTICLE_EXPORT_ 1

-#if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__))
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4275 )
--- a/include/osgPresentation/Export
+++ b/include/osgPresentation/Export
@@ -14,7 +14,9 @@
 #ifndef OSGPRESENTATION_EXPORT_
 #define OSGPRESENTATION_EXPORT_ 1

-#if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__))
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4275 )
--- a/include/osgQt/Export
+++ b/include/osgQt/Export
@@ -15,7 +15,9 @@
 #ifndef OSGQT_EXPORT_
 #define OSGQT_EXPORT_ 1

-#if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__))
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4267 )
--- a/include/osgShadow/Export
+++ b/include/osgShadow/Export
@@ -14,7 +14,9 @@
 #ifndef OSGSHADOW_EXPORT_
 #define OSGSHADOW_EXPORT_ 1

-#if defined(_MSC_VER)
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4267 )
--- a/include/osgSim/Export
+++ b/include/osgSim/Export
@@ -14,7 +14,9 @@
 #ifndef OSGSIM_EXPORT_
 #define OSGSIM_EXPORT_ 1

-#if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__))
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4275 )
--- a/include/osgTerrain/Export
+++ b/include/osgTerrain/Export
@@ -14,7 +14,9 @@
 #ifndef OSGTERRAIN_EXPORT_
 #define OSGTERRAIN_EXPORT_ 1

-#if defined(_MSC_VER)
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4267 )
--- a/include/osgText/Export
+++ b/include/osgText/Export
@@ -14,7 +14,9 @@
 #ifndef OSGTEXT_EXPORT_
 #define OSGTEXT_EXPORT_ 1

-#if defined(_MSC_VER)
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4267 )
--- a/include/osgUtil/Export
+++ b/include/osgUtil/Export
@@ -15,7 +15,9 @@
 #ifndef OSGUTIL_EXPORT_
 #define OSGUTIL_EXPORT_ 1

-#if defined(_MSC_VER)
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4267 )
--- a/include/osgViewer/Export
+++ b/include/osgViewer/Export
@@ -15,7 +15,9 @@
 #ifndef OSGVIEWER_EXPORT_
 #define OSGVIEWER_EXPORT_ 1

-#if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__))
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4267 )
--- a/include/osgVolume/Export
+++ b/include/osgVolume/Export
@@ -14,7 +14,9 @@
 #ifndef OSGVOLUME_EXPORT_
 #define OSGVOLUME_EXPORT_ 1

-#if defined(_MSC_VER)
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )
    #pragma warning( disable : 4267 )
--- a/include/osgWidget/Export
+++ b/include/osgWidget/Export
@@ -16,7 +16,9 @@
 #ifndef OSGWIDGET_EXPORT_
 #define OSGWIDGET_EXPORT_ 1

-#if defined(_MSC_VER)
+#include<osg/Config>
+
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
    #pragma warning( disable : 4121 )
    #pragma warning( disable : 4244 )
    #pragma warning( disable : 4251 )