aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2019-02-20 14:43:05 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2019-02-20 14:43:05 +0100
commit44b54fa4a3618922e06abdca9c555b8697698237 (patch)
tree3d61d55a0d8bfd4d289eea0558d8636bfc834fec /Eigen/src
parent7195f008ced2ec7fc8a1926d06b7cd797e9f3642 (diff)
Protect c++11 type alias with Eigen's macro, and add respective unit test.
Diffstat (limited to 'Eigen/src')
-rw-r--r--Eigen/src/Core/Array.h4
-rw-r--r--Eigen/src/Core/Matrix.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/Array.h b/Eigen/src/Core/Array.h
index 039f41a3d..a85d5084b 100644
--- a/Eigen/src/Core/Array.h
+++ b/Eigen/src/Core/Array.h
@@ -350,7 +350,7 @@ EIGEN_MAKE_ARRAY_TYPEDEFS_ALL_SIZES(std::complex<double>, cd)
#undef EIGEN_MAKE_ARRAY_TYPEDEFS_ALL_SIZES
#undef EIGEN_MAKE_ARRAY_TYPEDEFS
-#if __cplusplus>=201103L
+#if EIGEN_HAS_CXX11
#define EIGEN_MAKE_TYPEDEFS(Size, SizeSuffix) \
/** \ingroup matrixtypedefs */ \
@@ -379,7 +379,7 @@ EIGEN_MAKE_FIXED_TYPEDEFS(4)
#undef EIGEN_MAKE_TYPEDEFS
#undef EIGEN_MAKE_FIXED_TYPEDEFS
-#endif // __cplusplus>=201103L
+#endif // EIGEN_HAS_CXX11
#define EIGEN_USING_ARRAY_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, SizeSuffix) \
using Eigen::Matrix##SizeSuffix##TypeSuffix; \
diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h
index ea5f7da78..83cffc8e6 100644
--- a/Eigen/src/Core/Matrix.h
+++ b/Eigen/src/Core/Matrix.h
@@ -499,7 +499,7 @@ EIGEN_MAKE_TYPEDEFS_ALL_SIZES(std::complex<double>, cd)
#undef EIGEN_MAKE_TYPEDEFS
#undef EIGEN_MAKE_FIXED_TYPEDEFS
-#if __cplusplus>=201103L
+#if EIGEN_HAS_CXX11
#define EIGEN_MAKE_TYPEDEFS(Size, SizeSuffix) \
/** \ingroup matrixtypedefs */ \
@@ -531,7 +531,7 @@ EIGEN_MAKE_FIXED_TYPEDEFS(4)
#undef EIGEN_MAKE_TYPEDEFS
#undef EIGEN_MAKE_FIXED_TYPEDEFS
-#endif // __cplusplus>=201103L
+#endif // EIGEN_HAS_CXX11
} // end namespace Eigen