diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-03-05 10:52:08 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-03-05 10:52:08 -0800 |
| commit | 05bbca079a1c21fe3289d625a99200621606a0f6 (patch) | |
| tree | 185285c3b601d1c23885489f270800ce4731c111 /unsupported | |
| parent | 6093eb9ff564ded564fb48fdd01288140a9e3be6 (diff) | |
Turn on some of the cxx11 features when compiling with visual studio 2015
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Eigen/CXX11/Core | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/unsupported/Eigen/CXX11/Core b/unsupported/Eigen/CXX11/Core index c8dcf7c16..e3e2cb60c 100644 --- a/unsupported/Eigen/CXX11/Core +++ b/unsupported/Eigen/CXX11/Core @@ -35,11 +35,13 @@ #include "src/Core/util/EmulateArray.h" // Emulate the cxx11 functionality that we need if the compiler doesn't support it. -#if __cplusplus <= 199711L -#include "src/Core/util/EmulateCXX11Meta.h" -#else +// Visual studio 2015 doesn't advertise itself as cxx11 compliant, although it +// supports enough of the standard for our needs +#if __cplusplus > 199711L || EIGEN_COMP_MSVC >= 1900 #include "src/Core/util/CXX11Workarounds.h" #include "src/Core/util/CXX11Meta.h" +#else +#include "src/Core/util/EmulateCXX11Meta.h" #endif #include <Eigen/src/Core/util/ReenableStupidWarnings.h> |