diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-12-18 22:58:15 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-12-18 22:58:15 +0100 |
| commit | 25c7d9164f45119fa20dc6af2fa451d278c5f285 (patch) | |
| tree | 87aedc7d828176ac8817e2f1d26c98ee3597ca69 /Eigen/src/Core/util | |
| parent | b8d9eaa19bd8501e8007c4c3633904643b44617e (diff) | |
bug #920: fix MSVC 2015 compilation issues
Diffstat (limited to 'Eigen/src/Core/util')
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index bc26043d7..687ba41dd 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -73,7 +73,7 @@ /// \internal EIGEN_COMP_MSVC_STRICT set to 1 if the compiler is really Microsoft Visual C++ and not ,e.g., ICC #if EIGEN_COMP_MSVC && !(EIGEN_COMP_ICC) - #define EIGEN_COMP_MSVC_STRICT 1 + #define EIGEN_COMP_MSVC_STRICT _MSC_VER #else #define EIGEN_COMP_MSVC_STRICT 0 #endif @@ -592,7 +592,7 @@ namespace Eigen { // just an empty macro ! #define EIGEN_EMPTY -#if EIGEN_COMP_MSVC_STRICT +#if EIGEN_COMP_MSVC_STRICT && EIGEN_COMP_MSVC < 1900 #define EIGEN_INHERIT_ASSIGNMENT_EQUAL_OPERATOR(Derived) \ using Base::operator =; #elif EIGEN_COMP_CLANG // workaround clang bug (see http://forum.kde.org/viewtopic.php?f=74&t=102653) |