FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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."
This commit is contained in:
Robert Osfield
2011-03-09 14:15:04 +00:00
parent b91741b421
commit d3d0859b4c
14 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgAnimation/Export
View File

@@ -15,7 +15,9 @@
#ifndef OSGANIMATION_EXPORT_ #ifndef OSGANIMATION_EXPORT_
#define OSGANIMATION_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4267 ) #pragma warning( disable : 4267 )

4
include/osgDB/Export
View File

@@ -14,7 +14,9 @@
#ifndef OSGDB_EXPORT_ #ifndef OSGDB_EXPORT_
#define OSGDB_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4267 ) #pragma warning( disable : 4267 )

4
include/osgGA/Export
View File

@@ -15,7 +15,9 @@
#ifndef OSGGA_EXPORT_ #ifndef OSGGA_EXPORT_
#define OSGGA_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4267 ) #pragma warning( disable : 4267 )

4
include/osgParticle/Export
View File

@@ -15,7 +15,9 @@
#ifndef OSGPARTICLE_EXPORT_ #ifndef OSGPARTICLE_EXPORT_
#define OSGPARTICLE_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4275 ) #pragma warning( disable : 4275 )

4
include/osgPresentation/Export
View File

@@ -14,7 +14,9 @@
#ifndef OSGPRESENTATION_EXPORT_ #ifndef OSGPRESENTATION_EXPORT_
#define OSGPRESENTATION_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4275 ) #pragma warning( disable : 4275 )

4
include/osgQt/Export
View File

@@ -15,7 +15,9 @@
#ifndef OSGQT_EXPORT_ #ifndef OSGQT_EXPORT_
#define OSGQT_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4267 ) #pragma warning( disable : 4267 )

4
include/osgShadow/Export
View File

@@ -14,7 +14,9 @@
#ifndef OSGSHADOW_EXPORT_ #ifndef OSGSHADOW_EXPORT_
#define OSGSHADOW_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4267 ) #pragma warning( disable : 4267 )

4
include/osgSim/Export
View File

@@ -14,7 +14,9 @@
#ifndef OSGSIM_EXPORT_ #ifndef OSGSIM_EXPORT_
#define OSGSIM_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4275 ) #pragma warning( disable : 4275 )

4
include/osgTerrain/Export
View File

@@ -14,7 +14,9 @@
#ifndef OSGTERRAIN_EXPORT_ #ifndef OSGTERRAIN_EXPORT_
#define OSGTERRAIN_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4267 ) #pragma warning( disable : 4267 )

4
include/osgText/Export
View File

@@ -14,7 +14,9 @@
#ifndef OSGTEXT_EXPORT_ #ifndef OSGTEXT_EXPORT_
#define OSGTEXT_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4267 ) #pragma warning( disable : 4267 )

4
include/osgUtil/Export
View File

@@ -15,7 +15,9 @@
#ifndef OSGUTIL_EXPORT_ #ifndef OSGUTIL_EXPORT_
#define OSGUTIL_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4267 ) #pragma warning( disable : 4267 )

4
include/osgViewer/Export
View File

@@ -15,7 +15,9 @@
#ifndef OSGVIEWER_EXPORT_ #ifndef OSGVIEWER_EXPORT_
#define OSGVIEWER_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4267 ) #pragma warning( disable : 4267 )

4
include/osgVolume/Export
View File

@@ -14,7 +14,9 @@
#ifndef OSGVOLUME_EXPORT_ #ifndef OSGVOLUME_EXPORT_
#define OSGVOLUME_EXPORT_ 1 #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 : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4267 ) #pragma warning( disable : 4267 )

4
include/osgWidget/Export
View File

@@ -16,7 +16,9 @@
#ifndef OSGWIDGET_EXPORT_ #ifndef OSGWIDGET_EXPORT_
#define OSGWIDGET_EXPORT_ 1 #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 : 4121 )
#pragma warning( disable : 4244 ) #pragma warning( disable : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )