From 06971223efda38924832d86650ee1d4af6984344 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 22 Jan 2016 15:02:21 +0100 Subject: Unify std::numeric_limits and device::numeric_limits within numext namespace --- Eigen/src/Core/NumTraits.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'Eigen/src/Core/NumTraits.h') diff --git a/Eigen/src/Core/NumTraits.h b/Eigen/src/Core/NumTraits.h index d1aabd995..2ea5eb272 100644 --- a/Eigen/src/Core/NumTraits.h +++ b/Eigen/src/Core/NumTraits.h @@ -71,11 +71,7 @@ template struct GenericNumTraits EIGEN_DEVICE_FUNC static inline Real epsilon() { - #if defined(__CUDA_ARCH__) - return internal::device::numeric_limits::epsilon(); - #else - return std::numeric_limits::epsilon(); - #endif + return numext::numeric_limits::epsilon(); } EIGEN_DEVICE_FUNC static inline Real dummy_precision() @@ -87,20 +83,12 @@ template struct GenericNumTraits EIGEN_DEVICE_FUNC static inline T highest() { -#if defined(__CUDA_ARCH__) - return (internal::device::numeric_limits::max)(); -#else - return (std::numeric_limits::max)(); -#endif + return (numext::numeric_limits::max)(); } EIGEN_DEVICE_FUNC static inline T lowest() { -#if defined(__CUDA_ARCH__) - return IsInteger ? (internal::device::numeric_limits::min)() : (-(internal::device::numeric_limits::max)()); -#else - return IsInteger ? (std::numeric_limits::min)() : (-(std::numeric_limits::max)()); -#endif + return IsInteger ? (numext::numeric_limits::min)() : (-(numext::numeric_limits::max)()); } }; -- cgit v1.2.3