aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/NumTraits.h
diff options
context:
space:
mode:
authorGravatar Eugene Brevdo <ebrevdo@gmail.com>2016-03-08 17:28:21 -0800
committerGravatar Eugene Brevdo <ebrevdo@gmail.com>2016-03-08 17:28:21 -0800
commit73220d2bb044e5f01b3eee4838c5b32ca679f027 (patch)
tree37bcb2485d9fece4991c9a2e07dd6524a7e2bab1 /Eigen/src/Core/NumTraits.h
parent5f17de33933cdfa33af22621863864bcd3f73e42 (diff)
Resolve bad merge.
Diffstat (limited to 'Eigen/src/Core/NumTraits.h')
-rw-r--r--Eigen/src/Core/NumTraits.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/Eigen/src/Core/NumTraits.h b/Eigen/src/Core/NumTraits.h
index 6a596bb7d..7ddb4a867 100644
--- a/Eigen/src/Core/NumTraits.h
+++ b/Eigen/src/Core/NumTraits.h
@@ -95,6 +95,11 @@ template<typename T> struct GenericNumTraits
static inline T infinity() {
return numext::numeric_limits<T>::infinity();
}
+
+ EIGEN_DEVICE_FUNC
+ static inline T quiet_NaN() {
+ return numext::numeric_limits<T>::quiet_NaN();
+ }
};
template<typename T> struct NumTraits : GenericNumTraits<T>