GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-05-01 08:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken commit a09cfe650fe56b181747af04d61548800da1f72b

Browse Source 
. Missing } and unprotected min/max calls and definitions.
This commit is contained in:
Christoph Hertzberg 2015-08-22 15:03:16 +02:00
parent a09cfe650f
commit 78358a7241
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Eigen/src/Core/NumTraits.h
View File

@ -88,7 +88,7 @@ template<typename T> struct GenericNumTraits
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static inline T highest() { static inline T highest() {
#if defined(__CUDA_ARCH__) #if defined(__CUDA_ARCH__)
return internal::device::numeric_limits<T>::max(); return (internal::device::numeric_limits<T>::max)();
#else #else
return (std::numeric_limits<T>::max)(); return (std::numeric_limits<T>::max)();
#endif #endif
@ -101,6 +101,7 @@ template<typename T> struct GenericNumTraits
#else #else
return IsInteger ? (std::numeric_limits<T>::min)() : (-(std::numeric_limits<T>::max)()); return IsInteger ? (std::numeric_limits<T>::min)() : (-(std::numeric_limits<T>::max)());
#endif #endif
}
}; };
template<typename T> struct NumTraits : GenericNumTraits<T> template<typename T> struct NumTraits : GenericNumTraits<T>

24
Eigen/src/Core/util/Meta.h
View File

@ -128,53 +128,53 @@ template<typename T> struct numeric_limits
{ {
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static T epsilon() { return 0; } static T epsilon() { return 0; }
static T max() { assert(false && "Highest not suppoted for this type"); } static T (max)() { assert(false && "Highest not supported for this type"); }
static T min() { assert(false && "Lowest not suppoted for this type"); } static T (min)() { assert(false && "Lowest not supported for this type"); }
}; };
template<> struct numeric_limits<float> template<> struct numeric_limits<float>
{ {
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static float epsilon() { return __FLT_EPSILON__; } static float epsilon() { return __FLT_EPSILON__; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static float max() { return CUDART_MAX_NORMAL_F; } static float (max)() { return CUDART_MAX_NORMAL_F; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static float min() { return __FLT_EPSILON__; } static float (min)() { return __FLT_EPSILON__; }
}; };
template<> struct numeric_limits<double> template<> struct numeric_limits<double>
{ {
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static double epsilon() { return __DBL_EPSILON__; } static double epsilon() { return __DBL_EPSILON__; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static double max() { return CUDART_INF; } static double (max)() { return CUDART_INF; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static double min() { return __DBL_EPSILON__; } static double (min)() { return __DBL_EPSILON__; }
}; };
template<> struct numeric_limits<int> template<> struct numeric_limits<int>
{ {
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static int epsilon() { return 0; } static int epsilon() { return 0; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static int max() { return INT_MAX; } static int (max)() { return INT_MAX; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static int min() { return INT_MIN; } static int (min)() { return INT_MIN; }
}; };
template<> struct numeric_limits<long> template<> struct numeric_limits<long>
{ {
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static long epsilon() { return 0; } static long epsilon() { return 0; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static long max() { return LONG_MAX; } static long (max)() { return LONG_MAX; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static long min() { return LONG_MIN; } static long (min)() { return LONG_MIN; }
}; };
template<> struct numeric_limits<long long> template<> struct numeric_limits<long long>
{ {
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static long long epsilon() { return 0; } static long long epsilon() { return 0; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static long long max() { return LLONG_MAX; } static long long (max)() { return LLONG_MAX; }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
static long long min() { return LLONG_MIN; } static long long (min)() { return LLONG_MIN; }
}; };
} }