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

Clean up warning disable code

Browse Source
This commit is contained in:
Robert Osfield 2009-02-03 20:26:26 +00:00
parent 2540c7dd57
commit ff66ca022e
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/osgIntrospection/Export
View File

@ -15,13 +15,12 @@
#ifndef OSGINTROSPECTION_EXPORTHDR
#define OSGINTROSPECTION_EXPORTHDR 1
// define USE_DEPRECATED_API is used to include in API which is being fazed out
// if you can compile your apps with this turned off you are
// well placed for compatablity with future versions.
//#define USE_DEPRECATED_API
#if defined(_MSC_VER)
#pragma warning(disable : 4251)
#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
#pragma warning( disable : 4251 )
#pragma warning( disable : 4121 )
#pragma warning( disable : 4180 )
#pragma warning( disable : 4702 )
#endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)

10
include/osgIntrospection/TypedMethodInfo
View File

@ -15,12 +15,6 @@
#ifndef OSGINTROSPECTION_TYPEDMETHODINFO_
#define OSGINTROSPECTION_TYPEDMETHODINFO_
#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
// disable for this header the VS warning C4121 : "alignment of a member was sensitive to packing"
#pragma warning( push )
#pragma warning( disable : 4121)
#endif
#include <osgIntrospection/MethodInfo>
#include <osgIntrospection/Reflection>
#include <osgIntrospection/Utility>
@ -3907,9 +3901,5 @@ namespace osgIntrospection
}
#if defined(_MSC_VER)
#pragma warning( pop )
#endif
#endif