aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/NumTraits.h
diff options
context:
space:
mode:
Diffstat (limited to 'Eigen/src/Core/NumTraits.h')
-rw-r--r--Eigen/src/Core/NumTraits.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/NumTraits.h b/Eigen/src/Core/NumTraits.h
index fb7b0b0c4..edc2ad2c4 100644
--- a/Eigen/src/Core/NumTraits.h
+++ b/Eigen/src/Core/NumTraits.h
@@ -71,11 +71,11 @@ template<typename T> struct GenericNumTraits
};
typedef T Real;
- typedef typename internal::meta_if<
+ typedef typename internal::conditional<
IsInteger,
- typename internal::meta_if<sizeof(T)<=2, float, double>::ret,
+ typename internal::conditional<sizeof(T)<=2, float, double>::type,
T
- >::ret NonInteger;
+ >::type NonInteger;
typedef T Nested;
inline static Real epsilon() { return std::numeric_limits<T>::epsilon(); }