Update C++ standard detection logic for MSVC

apolukhin · May 3, 2020 · 0b93b5e · 0b93b5e
1 parent 165c3a9
commit 0b93b5e
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 34 deletions.
diff --git a/test/cpp_ctti_type_name_parser_lib.cpp b/test/cpp_ctti_type_name_parser_lib.cpp
@@ -6,10 +6,9 @@
 
 // For more information, see http://www.boost.org
 
-#include <boost/predef.h>
+#include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) ||                                                \
-  (BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(14, 0, 0))
+#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
 
 #include <boost/dll/config.hpp>
 #include <string>

diff --git a/test/cpp_import_class_test.cpp b/test/cpp_import_class_test.cpp
@@ -7,9 +7,9 @@
 // For more information, see http://www.boost.org
 
 
-#include <boost/predef.h>
+#include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(14,0,0))
+#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
 
 #include "../example/b2_workarounds.hpp"
 

diff --git a/test/cpp_import_test.cpp b/test/cpp_import_test.cpp
@@ -6,9 +6,9 @@
 
 // For more information, see http://www.boost.org
 
-#include <boost/predef.h>
+#include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(14,0,0))
+#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
 
 #include "../example/b2_workarounds.hpp"
 

diff --git a/test/cpp_load_test.cpp b/test/cpp_load_test.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/predef.h>
 
-#if (__cplusplus >= 201103L) || (defined(_MSVC_LANG) && _MSVC_LANG < 201103L)
+#if (__cplusplus >= 201103L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L)
 // Make sure that it at least compiles
 #  include <boost/dll/smart_library.hpp>
 #endif

diff --git a/test/cpp_mangle_test.cpp b/test/cpp_mangle_test.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/predef.h>
 
-#if (__cplusplus >= 201402L) || (BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(14,0,0))
+#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
 
 #include "../example/b2_workarounds.hpp"
 

diff --git a/test/cpp_test_library.cpp b/test/cpp_test_library.cpp
@@ -1,15 +1,15 @@
 // Copyright 2016 Klemens Morgenstern
-// Copyright 2017-2019 Antony Polukhin
+// Copyright 2017-2020 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 // For more information, see http://www.boost.org
 
-#include <boost/predef.h>
+#include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(14,0,0))
+#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
 
 #include <boost/dll/config.hpp>
 #include <boost/variant.hpp>

diff --git a/test/ctti_type_name_parser_test.cpp b/test/ctti_type_name_parser_test.cpp
@@ -6,11 +6,9 @@
 
 // For more information, see http://www.boost.org
 
-#include <boost/predef.h>
-
-#if (__cplusplus >= 201402L) ||                                                \
-  (BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(14, 0, 0))
+#include <boost/config.hpp>
 
+#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
 #include "../example/b2_workarounds.hpp"
 
 #include <boost/core/lightweight_test.hpp>

diff --git a/test/library_info_test.cpp b/test/library_info_test.cpp
@@ -1,5 +1,5 @@
 // Copyright 2011-2012 Renato Tegon Forti
-// Copyright 2015-2019 Antony Polukhin
+// Copyright 2015-2020 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/link.hpp b/test/link.hpp
@@ -1,4 +1,4 @@
-// Copyright 2018-2019 Antony Polukhin
+// Copyright 2018-2020 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
@@ -7,9 +7,9 @@
 // For more information, see http://www.boost.org
 
 
-#include <boost/predef.h>
+#include <boost/config.hpp>
 
-#if (__cplusplus >= 201402L) || (BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(14,0,0))
+#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
 
 #include <boost/dll/smart_library.hpp>
 #include <boost/dll/import_mangled.hpp>

diff --git a/test/link1.cpp b/test/link1.cpp
@@ -1,4 +1,4 @@
-// Copyright 2018-2019 Antony Polukhin
+// Copyright 2018-2020 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/link2.cpp b/test/link2.cpp
@@ -1,4 +1,4 @@
-// Copyright 2018-2019 Antony Polukhin
+// Copyright 2018-2020 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/section_name_too_big.cpp b/test/section_name_too_big.cpp
@@ -1,6 +1,6 @@
 // Copyright 2011-2012 Renato Tegon Forti
 // Copyright 2014 Renato Tegon Forti, Antony Polukhin.
-// Copyright 2015-2019 Antony Polukhin.
+// Copyright 2015-2020 Antony Polukhin.
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/shared_library_concurrent_load_test.cpp b/test/shared_library_concurrent_load_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 Antony Polukhin
+// Copyright 2015-2020 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/shared_library_errors.cpp b/test/shared_library_errors.cpp
@@ -1,6 +1,6 @@
 // Copyright 2011-2012 Renato Tegon Forti.
 // Copyright 2014 Renato Tegon Forti, Antony Polukhin.
-// Copyright 2015-2019 Antony Polukhin.
+// Copyright 2015-2020 Antony Polukhin.
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/shared_library_get_symbol_test.cpp b/test/shared_library_get_symbol_test.cpp
@@ -1,6 +1,6 @@
 // Copyright 2011-2012 Renato Tegon Forti.
 // Copyright 2014 Renato Tegon Forti, Antony Polukhin.
-// Copyright 2015-2019 Antony Polukhin.
+// Copyright 2015-2020 Antony Polukhin.
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/shared_library_load_test.cpp b/test/shared_library_load_test.cpp
@@ -1,5 +1,5 @@
 // Copyright 2011-2012 Renato Tegon Forti
-// Copyright 2015-2019 Antony Polukhin
+// Copyright 2015-2020 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/shared_library_search_symbol_test.cpp b/test/shared_library_search_symbol_test.cpp
@@ -1,6 +1,6 @@
 // Copyright 2011-2012 Renato Tegon Forti
 // Copyright 2014 Renato Tegon Forti, Antony Polukhin.
-// Copyright 2015-2019 Antony Polukhin.
+// Copyright 2015-2020 Antony Polukhin.
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/structures_tests.cpp b/test/structures_tests.cpp
@@ -1,5 +1,5 @@
 // Copyright 2014 Renato Tegon Forti, Antony Polukhin.
-// Copyright 2015-2019 Antony Polukhin.
+// Copyright 2015-2020 Antony Polukhin.
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/symbol_runtime_info_test.cpp b/test/symbol_runtime_info_test.cpp
@@ -1,5 +1,5 @@
 // Copyright 2014 Renato Tegon Forti, Antony Polukhin.
-// Copyright 2015-2019 Antony Polukhin.
+// Copyright 2015-2020 Antony Polukhin.
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt

diff --git a/test/template_method_linux_test.cpp b/test/template_method_linux_test.cpp
@@ -1,12 +1,12 @@
 // Copyright 2019 Ramil Gauss.
-// Copyright 2019 Antony Polukhin.
+// Copyright 2019-2020 Antony Polukhin.
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/predef.h>
-#if (__cplusplus >= 201402L) || (BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(14,0,0))
+#include <boost/config.hpp>
+#if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
 
 #include <boost/dll/smart_library.hpp>
 #include <boost/dll/import_mangled.hpp>

diff --git a/test/test_library.cpp b/test/test_library.cpp
@@ -1,6 +1,6 @@
 // Copyright 2011-2012 Renato Tegon Forti
 // Copyright 2014 Renato Tegon Forti, Antony Polukhin.
-// Copyright 2015-2019 Antony Polukhin.
+// Copyright 2015-2020 Antony Polukhin.
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt