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

Added VS and gcc warning suppression to clean up a few last stubborn warnings

Browse Source
This commit is contained in:
Robert Osfield 2009-02-05 11:10:32 +00:00
parent baac534bcc
commit 087d6390fa
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -547,14 +547,9 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
# errors instead of warnings for certain issues, including superfluous # errors instead of warnings for certain issues, including superfluous
# semicolons and commas, and the use of long long. -fpermissive seems # semicolons and commas, and the use of long long. -fpermissive seems
# to be the workaround. # to be the workaround.
SET(OSG_AGGRESSIVE_WARNING_FLAGS -Wall -Wparentheses -Wformat=2 -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive) SET(OSG_AGGRESSIVE_WARNING_FLAGS -Wall -Wparentheses -Wuninitialized -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive)
IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") # Previous included -Wformat=2 in OSG_AGGRESSIVE_WARNING_FLAGS but had to remove it due to standard library errors
# disable the "warning: format not a string literal and no format arguments" emited from std library ostream support
SET(OSG_AGGRESSIVE_WARNING_FLAGS ${OSG_AGGRESSIVE_WARNING_FLAGS} -Wformat=0)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
ELSE(CMAKE_COMPILER_IS_GNUCXX) ELSE(CMAKE_COMPILER_IS_GNUCXX)

1
include/osg/Export
View File

@ -25,6 +25,7 @@
#pragma warning( disable : 4244 ) #pragma warning( disable : 4244 )
#pragma warning( disable : 4251 ) #pragma warning( disable : 4251 )
#pragma warning( disable : 4275 ) #pragma warning( disable : 4275 )
#pragma warning( disable : 4512 )
#endif #endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)