# HG changeset patch # User Alpar Juttner # Date 1243526391 -3600 # Node ID 150004315af4c85b225977d888de22d35866492d # Parent 73ee142260f24a3ef57a878423427cc15a03f251# Parent da70af8844b94b631d8334fa5b89c2e3db5af4f4 Merge fix #295 diff -r 73ee142260f2 -r 150004315af4 CMakeLists.txt --- a/CMakeLists.txt Wed May 13 09:58:09 2009 +0100 +++ b/CMakeLists.txt Thu May 28 16:59:51 2009 +0100 @@ -17,16 +17,6 @@ FIND_PACKAGE(CPLEX) FIND_PACKAGE(COIN) -IF(MSVC) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4503 /wd4800 /wd4996") -# Suppressed warnings: -# C4250: 'class1' : inherits 'class2::member' via dominance -# C4355: 'this' : used in base member initializer list -# C4503: 'function' : decorated name length exceeded, name was truncated -# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning) -# C4996: 'function': was declared deprecated -ENDIF(MSVC) - INCLUDE(CheckTypeSize) CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG) diff -r 73ee142260f2 -r 150004315af4 lemon/core.h --- a/lemon/core.h Wed May 13 09:58:09 2009 +0100 +++ b/lemon/core.h Thu May 28 16:59:51 2009 +0100 @@ -27,6 +27,16 @@ #include #include +// Disable the following warnings when compiling with MSVC: +// C4250: 'class1' : inherits 'class2::member' via dominance +// C4355: 'this' : used in base member initializer list +// C4503: 'function' : decorated name length exceeded, name was truncated +// C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning) +// C4996: 'function': was declared deprecated +#ifdef _MSC_VER +#pragma warning( disable : 4250 4355 4503 4800 4996 ) +#endif + ///\file ///\brief LEMON core utilities. ///