diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2019-05-20 07:19:10 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2019-05-20 07:19:10 +0000 |
| commit | cc7ecbb1241cdc16b0b0f27631c556d8eda5aa4b (patch) | |
| tree | 6d4c598600494e2589521e008138c572c43157a6 | |
| parent | 01654d97fac5ad5be7d215981e81a606b4878447 (diff) | |
| parent | ff06ef7584147944a2c48f7e11154998dad9f7a1 (diff) | |
Merged in scramsby/eigen (pull request PR-646)
Eigen: Fix MSVC C++17 language standard detection logic
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index ce3633388..caed4c792 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -109,7 +109,7 @@ #endif // For the record, here is a table summarizing the possible values for EIGEN_COMP_MSVC: -// name ver MSC_VER +// name ver MSC_VER // 2008 9 1500 // 2010 10 1600 // 2012 11 1700 @@ -122,6 +122,19 @@ // 2017-14.13 15.6 1913 // 2017-14.14 15.7 1914 +/// \internal EIGEN_COMP_MSVC_LANG set to _MSVC_LANG if the compiler is Microsoft Visual C++, 0 otherwise. +#if defined(_MSVC_LANG) + #define EIGEN_COMP_MSVC_LANG _MSVC_LANG +#else + #define EIGEN_COMP_MSVC_LANG 0 +#endif + +// For the record, here is a table summarizing the possible values for EIGEN_COMP_MSVC_LANG: +// MSVC option Standard MSVC_LANG +// /std:c++14 (default as of VS 2019) C++14 201402L +// /std:c++17 C++17 201703L +// /std:c++latest >C++17 >201703L + /// \internal EIGEN_COMP_MSVC_STRICT set to 1 if the compiler is really Microsoft Visual C++ and not ,e.g., ICC or clang-cl #if EIGEN_COMP_MSVC && !(EIGEN_COMP_ICC || EIGEN_COMP_LLVM || EIGEN_COMP_CLANG) #define EIGEN_COMP_MSVC_STRICT _MSC_VER @@ -512,7 +525,7 @@ // The macro EIGEN_COMP_CXXVER defines the c++ verson expected by the compiler. // For instance, if compiling with gcc and -std=c++17, then EIGEN_COMP_CXXVER // is defined to 17. -#if (defined(__cplusplus) && (__cplusplus > 201402L) || EIGEN_COMP_MSVC >= 1914) +#if (defined(__cplusplus) && (__cplusplus > 201402L) || EIGEN_COMP_MSVC_LANG > 201402L) #define EIGEN_COMP_CXXVER 17 #elif (defined(__cplusplus) && (__cplusplus > 201103L) || EIGEN_COMP_MSVC >= 1910) #define EIGEN_COMP_CXXVER 14 |