Rename free functions isFinite, isInf, isNaN to be compatible with c++11

3 files changed, 42 insertions, 50 deletions

diff --git a/test/array.cpp b/test/array.cpp
index 90c75e9f0..b802e52f6 100644
--- a/test/array.cpp
+++ b/test/array.cpp
@@ -215,9 +215,9 @@ template<typename ArrayType> void array_real(const ArrayType& m)
   VERIFY_IS_APPROX(m1.round(), round(m1));
   VERIFY_IS_APPROX(m1.floor(), floor(m1));
   VERIFY_IS_APPROX(m1.ceil(), ceil(m1));
-  VERIFY((m1.isNaN() == isNaN(m1)).all());
-  VERIFY((m1.isInf() == isInf(m1)).all());
-  VERIFY((m1.isFinite() == isFinite(m1)).all());
+  VERIFY((m1.isNaN() == isnan(m1)).all());
+  VERIFY((m1.isInf() == isinf(m1)).all());
+  VERIFY((m1.isFinite() == isfinite(m1)).all());
   VERIFY_IS_APPROX(m1.inverse(), inverse(m1));
   VERIFY_IS_APPROX(m1.abs(), abs(m1));
   VERIFY_IS_APPROX(m1.abs2(), abs2(m1));
@@ -243,9 +243,9 @@ template<typename ArrayType> void array_real(const ArrayType& m)
   VERIFY_IS_APPROX(tanh(m1), (0.5*(exp(m1)-exp(-m1)))/(0.5*(exp(m1)+exp(-m1))));
   VERIFY_IS_APPROX(arg(m1), ((ArrayType)(m1<0))*std::acos(-1.0));
   VERIFY((round(m1) <= ceil(m1) && round(m1) >= floor(m1)).all());
-  VERIFY(isNaN(m1*0.0/0.0).all());
-  VERIFY(isInf(m1/0.0).all());
-  VERIFY((isFinite(m1) && !isFinite(m1*0.0/0.0) && !isFinite(m1/0.0)).all());
+  VERIFY(isnan(m1*0.0/0.0).all());
+  VERIFY(isinf(m1/0.0).all());
+  VERIFY((isfinite(m1) && !isfinite(m1*0.0/0.0) && !isfinite(m1/0.0)).all());
   VERIFY_IS_APPROX(inverse(inverse(m1)),m1);
   VERIFY((abs(m1) == m1 || abs(m1) == -m1).all());
   VERIFY_IS_APPROX(m3, sqrt(abs2(m1)));
@@ -317,9 +317,9 @@ template<typename ArrayType> void array_complex(const ArrayType& m)
   VERIFY_IS_APPROX(m1.cosh(), cosh(m1));
   VERIFY_IS_APPROX(m1.tanh(), tanh(m1));
   VERIFY_IS_APPROX(m1.arg(), arg(m1));
-  VERIFY((m1.isNaN() == isNaN(m1)).all());
-  VERIFY((m1.isInf() == isInf(m1)).all());
-  VERIFY((m1.isFinite() == isFinite(m1)).all());
+  VERIFY((m1.isNaN() == isnan(m1)).all());
+  VERIFY((m1.isInf() == isinf(m1)).all());
+  VERIFY((m1.isFinite() == isfinite(m1)).all());
   VERIFY_IS_APPROX(m1.inverse(), inverse(m1));
   VERIFY_IS_APPROX(m1.log(), log(m1));
   VERIFY_IS_APPROX(m1.log10(), log10(m1));
@@ -345,9 +345,9 @@ template<typename ArrayType> void array_complex(const ArrayType& m)
   VERIFY_IS_APPROX(arg(m1), m3);
 
   std::complex<RealScalar> zero(0.0,0.0);
-  VERIFY(isNaN(m1*zero/zero).all());
-  VERIFY(isInf(m1/zero).all());
-  VERIFY((isFinite(m1) && !isFinite(m1*zero/zero) && !isFinite(m1/zero)).all());
+  VERIFY(isnan(m1*zero/zero).all());
+  VERIFY(isinf(m1/zero).all());
+  VERIFY((isfinite(m1) && !isfinite(m1*zero/zero) && !isfinite(m1/zero)).all());
 
   VERIFY_IS_APPROX(inverse(inverse(m1)),m1);
   VERIFY_IS_APPROX(conj(m1.conjugate()), m1);
diff --git a/test/packetmath.cpp b/test/packetmath.cpp
index e3a754627..2f1accd1b 100644
--- a/test/packetmath.cpp
+++ b/test/packetmath.cpp
@@ -317,7 +317,7 @@ template<typename Scalar> void packetmath_real()
     data1[0] = std::numeric_limits<Scalar>::quiet_NaN();
     packet_helper<internal::packet_traits<Scalar>::HasExp,Packet> h;
     h.store(data2, internal::pexp(h.load(data1))); 
-    VERIFY(numext::isNaN(data2[0]));
+    VERIFY(numext::isnan(data2[0]));
   }
 
   for (int i=0; i<size; ++i)
@@ -333,14 +333,14 @@ template<typename Scalar> void packetmath_real()
     data1[0] = std::numeric_limits<Scalar>::quiet_NaN();
     packet_helper<internal::packet_traits<Scalar>::HasLog,Packet> h;
     h.store(data2, internal::plog(h.load(data1)));
-    VERIFY(numext::isNaN(data2[0]));
+    VERIFY(numext::isnan(data2[0]));
     data1[0] = -1.0f;
     h.store(data2, internal::plog(h.load(data1)));
-    VERIFY(numext::isNaN(data2[0]));
+    VERIFY(numext::isnan(data2[0]));
 #if !EIGEN_FAST_MATH
     h.store(data2, internal::psqrt(h.load(data1)));
-    VERIFY(numext::isNaN(data2[0]));
-    VERIFY(numext::isNaN(data2[1]));
+    VERIFY(numext::isnan(data2[0]));
+    VERIFY(numext::isnan(data2[1]));
 #endif
   }
 }
diff --git a/test/stable_norm.cpp b/test/stable_norm.cpp
index 0674006de..21fae494b 100644
--- a/test/stable_norm.cpp
+++ b/test/stable_norm.cpp
@@ -9,14 +9,6 @@
 
 #include "main.h"
 
-// workaround aggressive optimization in ICC
-template<typename T> EIGEN_DONT_INLINE  T sub(T a, T b) { return a - b; }
-
-template<typename T> bool isFinite(const T& x)
-{
-  return isNotNaN(sub(x,x));
-}
-
 template<typename T> EIGEN_DONT_INLINE T copy(const T& x)
 {
   return x;
@@ -76,19 +68,19 @@ template<typename MatrixType> void stable_norm(const MatrixType& m)
 
   RealScalar size = static_cast<RealScalar>(m.size());
 
-  // test isFinite
-  VERIFY(!isFinite( std::numeric_limits<RealScalar>::infinity()));
-  VERIFY(!isFinite(sqrt(-abs(big))));
+  // test numext::isfinite
+  VERIFY(!numext::isfinite( std::numeric_limits<RealScalar>::infinity()));
+  VERIFY(!numext::isfinite(sqrt(-abs(big))));
 
   // test overflow
-  VERIFY(isFinite(sqrt(size)*abs(big)));
+  VERIFY(numext::isfinite(sqrt(size)*abs(big)));
   VERIFY_IS_NOT_APPROX(sqrt(copy(vbig.squaredNorm())), abs(sqrt(size)*big)); // here the default norm must fail
   VERIFY_IS_APPROX(vbig.stableNorm(), sqrt(size)*abs(big));
   VERIFY_IS_APPROX(vbig.blueNorm(),   sqrt(size)*abs(big));
   VERIFY_IS_APPROX(vbig.hypotNorm(),  sqrt(size)*abs(big));
 
   // test underflow
-  VERIFY(isFinite(sqrt(size)*abs(small)));
+  VERIFY(numext::isfinite(sqrt(size)*abs(small)));
   VERIFY_IS_NOT_APPROX(sqrt(copy(vsmall.squaredNorm())),   abs(sqrt(size)*small)); // here the default norm must fail
   VERIFY_IS_APPROX(vsmall.stableNorm(), sqrt(size)*abs(small));
   VERIFY_IS_APPROX(vsmall.blueNorm(),   sqrt(size)*abs(small));
@@ -111,33 +103,33 @@ template<typename MatrixType> void stable_norm(const MatrixType& m)
   {
     v = vrand;
     v(i,j) = std::numeric_limits<RealScalar>::quiet_NaN();
-    VERIFY(!isFinite(v.squaredNorm()));   VERIFY(numext::isNaN(v.squaredNorm()));
-    VERIFY(!isFinite(v.norm()));          VERIFY(numext::isNaN(v.norm()));
-    VERIFY(!isFinite(v.stableNorm()));    VERIFY(numext::isNaN(v.stableNorm()));
-    VERIFY(!isFinite(v.blueNorm()));      VERIFY(numext::isNaN(v.blueNorm()));
-    VERIFY(!isFinite(v.hypotNorm()));     VERIFY(numext::isNaN(v.hypotNorm()));
+    VERIFY(!numext::isfinite(v.squaredNorm()));   VERIFY(numext::isnan(v.squaredNorm()));
+    VERIFY(!numext::isfinite(v.norm()));          VERIFY(numext::isnan(v.norm()));
+    VERIFY(!numext::isfinite(v.stableNorm()));    VERIFY(numext::isnan(v.stableNorm()));
+    VERIFY(!numext::isfinite(v.blueNorm()));      VERIFY(numext::isnan(v.blueNorm()));
+    VERIFY(!numext::isfinite(v.hypotNorm()));     VERIFY(numext::isnan(v.hypotNorm()));
   }
   
   // +inf
   {
     v = vrand;
     v(i,j) = std::numeric_limits<RealScalar>::infinity();
-    VERIFY(!isFinite(v.squaredNorm()));   VERIFY(isPlusInf(v.squaredNorm()));
-    VERIFY(!isFinite(v.norm()));          VERIFY(isPlusInf(v.norm()));
-    VERIFY(!isFinite(v.stableNorm()));    VERIFY(isPlusInf(v.stableNorm()));
-    VERIFY(!isFinite(v.blueNorm()));      VERIFY(isPlusInf(v.blueNorm()));
-    VERIFY(!isFinite(v.hypotNorm()));     VERIFY(isPlusInf(v.hypotNorm()));
+    VERIFY(!numext::isfinite(v.squaredNorm()));   VERIFY(isPlusInf(v.squaredNorm()));
+    VERIFY(!numext::isfinite(v.norm()));          VERIFY(isPlusInf(v.norm()));
+    VERIFY(!numext::isfinite(v.stableNorm()));    VERIFY(isPlusInf(v.stableNorm()));
+    VERIFY(!numext::isfinite(v.blueNorm()));      VERIFY(isPlusInf(v.blueNorm()));
+    VERIFY(!numext::isfinite(v.hypotNorm()));     VERIFY(isPlusInf(v.hypotNorm()));
   }
   
   // -inf
   {
     v = vrand;
     v(i,j) = -std::numeric_limits<RealScalar>::infinity();
-    VERIFY(!isFinite(v.squaredNorm()));   VERIFY(isPlusInf(v.squaredNorm()));
-    VERIFY(!isFinite(v.norm()));          VERIFY(isPlusInf(v.norm()));
-    VERIFY(!isFinite(v.stableNorm()));    VERIFY(isPlusInf(v.stableNorm()));
-    VERIFY(!isFinite(v.blueNorm()));      VERIFY(isPlusInf(v.blueNorm()));
-    VERIFY(!isFinite(v.hypotNorm()));     VERIFY(isPlusInf(v.hypotNorm()));
+    VERIFY(!numext::isfinite(v.squaredNorm()));   VERIFY(isPlusInf(v.squaredNorm()));
+    VERIFY(!numext::isfinite(v.norm()));          VERIFY(isPlusInf(v.norm()));
+    VERIFY(!numext::isfinite(v.stableNorm()));    VERIFY(isPlusInf(v.stableNorm()));
+    VERIFY(!numext::isfinite(v.blueNorm()));      VERIFY(isPlusInf(v.blueNorm()));
+    VERIFY(!numext::isfinite(v.hypotNorm()));     VERIFY(isPlusInf(v.hypotNorm()));
   }
   
   // mix
@@ -147,11 +139,11 @@ template<typename MatrixType> void stable_norm(const MatrixType& m)
     v = vrand;
     v(i,j) = -std::numeric_limits<RealScalar>::infinity();
     v(i2,j2) = std::numeric_limits<RealScalar>::quiet_NaN();
-    VERIFY(!isFinite(v.squaredNorm()));   VERIFY(numext::isNaN(v.squaredNorm()));
-    VERIFY(!isFinite(v.norm()));          VERIFY(numext::isNaN(v.norm()));
-    VERIFY(!isFinite(v.stableNorm()));    VERIFY(numext::isNaN(v.stableNorm()));
-    VERIFY(!isFinite(v.blueNorm()));      VERIFY(numext::isNaN(v.blueNorm()));
-    VERIFY(!isFinite(v.hypotNorm()));     VERIFY(numext::isNaN(v.hypotNorm()));
+    VERIFY(!numext::isfinite(v.squaredNorm()));   VERIFY(numext::isnan(v.squaredNorm()));
+    VERIFY(!numext::isfinite(v.norm()));          VERIFY(numext::isnan(v.norm()));
+    VERIFY(!numext::isfinite(v.stableNorm()));    VERIFY(numext::isnan(v.stableNorm()));
+    VERIFY(!numext::isfinite(v.blueNorm()));      VERIFY(numext::isnan(v.blueNorm()));
+    VERIFY(!numext::isfinite(v.hypotNorm()));     VERIFY(numext::isnan(v.hypotNorm()));
   }
 }