From 5937c4ae32feec178d56282694f06ed16cfe7352 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Mon, 13 Feb 2017 17:14:26 +0100 Subject: Fall back is_integral to std::is_integral in c++11 --- Eigen/src/Core/util/Meta.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Eigen/src/Core/util/Meta.h') diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h index 11c089020..90eda6e70 100755 --- a/Eigen/src/Core/util/Meta.h +++ b/Eigen/src/Core/util/Meta.h @@ -97,6 +97,9 @@ template<> struct is_arithmetic { enum { value = true }; }; template<> struct is_arithmetic { enum { value = true }; }; template<> struct is_arithmetic { enum { value = true }; }; +#if EIGEN_HAS_CXX11 +using std::is_integral; +#else template struct is_integral { enum { value = false }; }; template<> struct is_integral { enum { value = true }; }; template<> struct is_integral { enum { value = true }; }; @@ -108,8 +111,8 @@ template<> struct is_integral { enum { value = true }; } template<> struct is_integral { enum { value = true }; }; template<> struct is_integral { enum { value = true }; }; template<> struct is_integral { enum { value = true }; }; -template<> struct is_integral { enum { value = true }; }; -template<> struct is_integral { enum { value = true }; }; +#endif + template struct add_const { typedef const T type; }; template struct add_const { typedef T& type; }; -- cgit v1.2.3