diff --git a/CMakeLists.txt b/CMakeLists.txt index f6ebf10d7..84c68dcd8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -563,8 +563,7 @@ ELSE(CMAKE_COMPILER_IS_GNUCXX) # FIXME: What are good aggressive warning flags for Visual Studio? # And do we need to further subcase this for different versions of VS? # CMake variables: MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005 - SET(OSG_AGGRESSIVE_WARNING_FLAGS "/W4") - + SET(OSG_AGGRESSIVE_WARNING_FLAGS "/W4 /wd4706 /wd4127") ELSE(MSVC) # CMake lacks an elseif, so other non-gcc, non-VS compilers need diff --git a/include/osg/Export b/include/osg/Export index 733b5e0a3..422a7ad00 100644 --- a/include/osg/Export +++ b/include/osg/Export @@ -30,10 +30,6 @@ #pragma warning( disable : 4786 ) #pragma warning( disable : 4305 ) #pragma warning( disable : 4996 ) - - - // suppress warnings about valid if ((variable=expression)) {} usage. - #pragma warning( disable : 4706 ) #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)