From 9a54c3e32bfefc5f7ffb998e5971ba80fc7a52ad Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Sun, 6 Mar 2016 09:38:56 -0800 Subject: [PATCH] Don't warn that msvc 2015 isn't c++11 compliant just because it doesn't claim to be. --- unsupported/Eigen/CXX11/src/Core/util/CXX11Workarounds.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unsupported/Eigen/CXX11/src/Core/util/CXX11Workarounds.h b/unsupported/Eigen/CXX11/src/Core/util/CXX11Workarounds.h index b1528aa66..fe4d22803 100644 --- a/unsupported/Eigen/CXX11/src/Core/util/CXX11Workarounds.h +++ b/unsupported/Eigen/CXX11/src/Core/util/CXX11Workarounds.h @@ -29,8 +29,10 @@ /* Check that the compiler at least claims to support C++11. It might not be sufficient * because the compiler may not implement it correctly, but at least we'll know. + * On the other hand, visual studio still doesn't claim to support C++11 although it's + * compliant enugh for our purpose. */ -#if __cplusplus <= 199711L +#if (__cplusplus <= 199711L) && (EIGEN_COMP_MSVC < 1900) #if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) #pragma GCC diagnostic error "-Wfatal-errors" #endif