From 7dd3e0de46da5fcb9b5bbd15511d3e56f4b595b9 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Mon, 28 Aug 2017 18:24:25 -0400 Subject: [PATCH] suppress MSVC warnings Those are new warnings introduced with 19.11 (2017 final) --- .../boost-1.62.0/include/boost/config/compiler/visualc.hpp | 5 +++-- cmake/setup_compiler_flags_msvc.cmake | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bundled/boost-1.62.0/include/boost/config/compiler/visualc.hpp b/bundled/boost-1.62.0/include/boost/config/compiler/visualc.hpp index dcf2759ef5..a0ab4810d4 100644 --- a/bundled/boost-1.62.0/include/boost/config/compiler/visualc.hpp +++ b/bundled/boost-1.62.0/include/boost/config/compiler/visualc.hpp @@ -294,9 +294,10 @@ #endif // -// tjhei: taken from boost git repo +// tjhei: upgrade supported MSVC version to 19.11 +// Boost repo has only 19.10: // last known and checked version is 19.10.24629 (VC++ 2017 RC): -#if (_MSC_VER > 1910) +#if (_MSC_VER > 1911) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else diff --git a/cmake/setup_compiler_flags_msvc.cmake b/cmake/setup_compiler_flags_msvc.cmake index a533697a83..f4cfcabc2d 100644 --- a/cmake/setup_compiler_flags_msvc.cmake +++ b/cmake/setup_compiler_flags_msvc.cmake @@ -73,6 +73,10 @@ ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "/wd4789") ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "/wd4808") +# Bug in MSVC 2017: bogus warning C5037: an out-of-line definition of a member of a class template cannot have default arguments +# see https://developercommunity.visualstudio.com/content/problem/81223/incorrect-error-c5037-with-permissive.html +ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "/wd5037") + ############################# # # # For Release target: # -- 2.39.5