diff options
| author |  Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2015-08-22 15:03:16 +0200 |
|---|---|---|
| committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2015-08-22 15:03:16 +0200 |
| commit | 78358a72419482a8b58c2b0caa56ffa2aede995a (patch) | |
| tree | 5ee3b2fec227eb3ce61785d8e4b17251d0ae9d20 /Eigen/src/Core/NumTraits.h | |
| parent | a09cfe650fe56b181747af04d61548800da1f72b (diff) | |
Fixed broken commit a09cfe650fe56b181747af04d61548800da1f72b
. Missing } and unprotected min/max calls and definitions.
Diffstat (limited to 'Eigen/src/Core/NumTraits.h')
| -rw-r--r-- | Eigen/src/Core/NumTraits.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Eigen/src/Core/NumTraits.h b/Eigen/src/Core/NumTraits.h index 4d60cf88b..61ec2f533 100644 --- a/Eigen/src/Core/NumTraits.h +++ b/Eigen/src/Core/NumTraits.h @@ -88,7 +88,7 @@ template<typename T> struct GenericNumTraits EIGEN_DEVICE_FUNC static inline T highest() { #if defined(__CUDA_ARCH__) - return internal::device::numeric_limits<T>::max(); + return (internal::device::numeric_limits<T>::max)(); #else return (std::numeric_limits<T>::max)(); #endif @@ -101,6 +101,7 @@ template<typename T> struct GenericNumTraits #else return IsInteger ? (std::numeric_limits<T>::min)() : (-(std::numeric_limits<T>::max)()); #endif + } }; template<typename T> struct NumTraits : GenericNumTraits<T> |