diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-11-04 21:58:52 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-11-04 21:58:52 +0100 |
| commit | ee06f786797b74e75e6c2eae1209fa6389c49876 (patch) | |
| tree | 6bbd10e84a32664cc7a99484b242df393b02f7f4 /Eigen/src/Core/util/StaticAssert.h | |
| parent | c5a3777666f5876ced7274297c797dac555f53e0 (diff) | |
Introduce unified macros to identify compiler, OS, and architecture. They are all defined in util/Macros.h and prefixed with EIGEN_COMP_, EIGEN_OS_, and EIGEN_ARCH_ respectively.
Diffstat (limited to 'Eigen/src/Core/util/StaticAssert.h')
| -rw-r--r-- | Eigen/src/Core/util/StaticAssert.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/StaticAssert.h b/Eigen/src/Core/util/StaticAssert.h index 54a16ebf2..f53dd9bfe 100644 --- a/Eigen/src/Core/util/StaticAssert.h +++ b/Eigen/src/Core/util/StaticAssert.h @@ -26,7 +26,7 @@ #ifndef EIGEN_NO_STATIC_ASSERT - #if defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_MSC_VER) && (_MSC_VER >= 1600)) + #if defined(__GXX_EXPERIMENTAL_CXX0X__) || (EIGEN_COMP_MSVC >= 1600) // if native static_assert is enabled, let's use it #define EIGEN_STATIC_ASSERT(X,MSG) static_assert(X,#MSG); @@ -103,7 +103,7 @@ // Specialized implementation for MSVC to avoid "conditional // expression is constant" warnings. This implementation doesn't // appear to work under GCC, hence the multiple implementations. - #ifdef _MSC_VER + #if EIGEN_COMP_MSVC #define EIGEN_STATIC_ASSERT(CONDITION,MSG) \ {Eigen::internal::static_assertion<bool(CONDITION)>::MSG;} |