Fix C++ standard detection logic for MSVC

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

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/include/boost/dll/import_class.hpp b/include/boost/dll/import_class.hpp
@@ -16,7 +16,7 @@
 #include <boost/dll/import_mangled.hpp>
 #include <memory>
 
-#if (__cplusplus < 201103L) || (defined(_MSVC_LANG) && _MSVC_LANG < 201103L)
+#if (__cplusplus < 201103L) && (!defined(_MSVC_LANG) || _MSVC_LANG < 201103L)
 #  error This file requires C++11 at least!
 #endif
 

diff --git a/include/boost/dll/import_mangled.hpp b/include/boost/dll/import_mangled.hpp
@@ -14,7 +14,7 @@
 /// \brief Contains the boost::dll::experimental::import_mangled function for importing mangled symbols.
 
 #include <boost/dll/config.hpp>
-#if (__cplusplus < 201103L) || (defined(_MSVC_LANG) && _MSVC_LANG < 201103L)
+#if (__cplusplus < 201103L) && (!defined(_MSVC_LANG) || _MSVC_LANG < 201103L)
 #  error This file requires C++11 at least!
 #endif
 

diff --git a/include/boost/dll/smart_library.hpp b/include/boost/dll/smart_library.hpp
@@ -19,7 +19,7 @@
 #   include <boost/dll/detail/demangling/itanium.hpp>
 #endif
 
-#if (__cplusplus < 201103L) || (defined(_MSVC_LANG) && _MSVC_LANG < 201103L)
+#if (__cplusplus < 201103L) && (!defined(_MSVC_LANG) || _MSVC_LANG < 201103L)
 #  error This file requires C++11 at least!
 #endif
 

diff --git a/test/cpp_load_test.cpp b/test/cpp_load_test.cpp
@@ -7,6 +7,7 @@
 
 // For more information, see http://www.boost.org
 
+#include <boost/config.hpp>
 #include <boost/predef.h>
 
 #if (__cplusplus >= 201103L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L)

diff --git a/test/cpp_mangle_test.cpp b/test/cpp_mangle_test.cpp
@@ -6,7 +6,7 @@
 
 // For more information, see http://www.boost.org
 
-#include <boost/predef.h>
+#include <boost/config.hpp>
 
 #if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)