diff options
| author |  Antonio Sanchez <cantonios@google.com> | 2021-03-01 15:57:22 -0800 |
|---|---|---|
| committer |  Rasmus Munk Larsen <rmlarsen@google.com> | 2021-03-05 18:33:18 +0000 |
| commit | 2468253c9adbb1e42be9227848c2d9a7b578dbaf (patch) | |
| tree | b35b5e33db3cc2010c77999c2252261a119ed16b /test/sparse_basic.cpp | |
| parent | 82d61af3a490154ad1c0ae2fe00c561095854897 (diff) | |
Define EIGEN_CPLUSPLUS and replace most __cplusplus checks.
The macro `__cplusplus` is not defined correctly in MSVC unless building
with the the `/Zc:__cplusplus` flag. Instead, it defines `_MSVC_LANG` to the
specified c++ standard version number.
Here we introduce `EIGEN_CPLUSPLUS` which will contain the c++ version
number both for MSVC and otherwise. This simplifies checks for supported
features.
Also replaced most instances of standard version checking via `__cplusplus`
with the existing `EIGEN_COMP_CXXVER` macro for better clarity.
Fixes: #2170
Diffstat (limited to 'test/sparse_basic.cpp')
| -rw-r--r-- | test/sparse_basic.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/sparse_basic.cpp b/test/sparse_basic.cpp index 17897fd61..f7ad930e9 100644 --- a/test/sparse_basic.cpp +++ b/test/sparse_basic.cpp @@ -413,7 +413,7 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re m.setFromTriplets(triplets.begin(), triplets.end(), std::multiplies<Scalar>()); VERIFY_IS_APPROX(m, refMat_prod); -#if (defined(__cplusplus) && __cplusplus >= 201103L) +#if (EIGEN_COMP_CXXVER >= 11) m.setFromTriplets(triplets.begin(), triplets.end(), [] (Scalar,Scalar b) { return b; }); VERIFY_IS_APPROX(m, refMat_last); #endif |