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

3 files changed, 26 insertions, 34 deletions

diff --git a/Eigen/src/Core/GlobalFunctions.h b/Eigen/src/Core/GlobalFunctions.h
index 1924c8e5f..33151a0de 100644
--- a/Eigen/src/Core/GlobalFunctions.h
+++ b/Eigen/src/Core/GlobalFunctions.h
@@ -62,9 +62,9 @@ namespace Eigen
   EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(round,scalar_round_op)
   EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(floor,scalar_floor_op)
   EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(ceil,scalar_ceil_op)
-  EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(isNaN,scalar_isNaN_op)
-  EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(isInf,scalar_isInf_op)
-  EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(isFinite,scalar_isFinite_op)
+  EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(isnan,scalar_isnan_op)
+  EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(isinf,scalar_isinf_op)
+  EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(isfinite,scalar_isfinite_op)
   
   template<typename Derived>
   inline const Eigen::CwiseUnaryOp<Eigen::internal::scalar_pow_op<typename Derived::Scalar>, const Derived>
diff --git a/Eigen/src/Core/MathFunctions.h b/Eigen/src/Core/MathFunctions.h
index 1ce935909..dfdca4f94 100644
--- a/Eigen/src/Core/MathFunctions.h
+++ b/Eigen/src/Core/MathFunctions.h
@@ -803,14 +803,12 @@ template<typename T>
 EIGEN_DEVICE_FUNC
 bool (isfinite)(const std::complex<T>& x)
 {
-  using std::real;
-  using std::imag;
-  return isfinite(real(x)) && isfinite(imag(x));
+  return numext::isfinite(numext::real(x)) && numext::isfinite(numext::imag(x));
 }
 
 template<typename T>
 EIGEN_DEVICE_FUNC
-bool (isNaN)(const T& x)
+bool (isnan)(const T& x)
 {
   #ifdef EIGEN_HAS_C99_MATH
     using std::isnan;
@@ -822,17 +820,14 @@ bool (isNaN)(const T& x)
 
 template<typename T>
 EIGEN_DEVICE_FUNC
-bool (isNaN)(const std::complex<T>& x)
+bool (isnan)(const std::complex<T>& x)
 {
-  using std::real;
-  using std::imag;
-  using std::isnan;
-  return isnan(real(x)) || isnan(imag(x));
+  return numext::isnan(numext::real(x)) || numext::isnan(numext::imag(x));
 }
 
 template<typename T>
 EIGEN_DEVICE_FUNC
-bool (isInf)(const T& x)
+bool (isinf)(const T& x)
 {
   #ifdef EIGEN_HAS_C99_MATH
     using std::isinf;
@@ -844,12 +839,9 @@ bool (isInf)(const T& x)
 
 template<typename T>
 EIGEN_DEVICE_FUNC
-bool (isInf)(const std::complex<T>& x)
+bool (isinf)(const std::complex<T>& x)
 {
-  using std::real;
-  using std::imag;
-  using std::isinf;
-  return isinf(real(x)) || isinf(imag(x));
+  return numext::isinf(numext::real(x)) || numext::isinf(numext::imag(x));
 }
 
 template<typename Scalar>
diff --git a/Eigen/src/Core/functors/UnaryFunctors.h b/Eigen/src/Core/functors/UnaryFunctors.h
index a6fa5ee31..2fc84e01f 100644
--- a/Eigen/src/Core/functors/UnaryFunctors.h
+++ b/Eigen/src/Core/functors/UnaryFunctors.h
@@ -586,15 +586,15 @@ struct functor_traits<scalar_ceil_op<Scalar> >
 
 /** \internal
   * \brief Template functor to compute whether a scalar is NaN
-  * \sa class CwiseUnaryOp, ArrayBase::isNaN()
+  * \sa class CwiseUnaryOp, ArrayBase::isnan()
   */
-template<typename Scalar> struct scalar_isNaN_op {
-  EIGEN_EMPTY_STRUCT_CTOR(scalar_isNaN_op)
+template<typename Scalar> struct scalar_isnan_op {
+  EIGEN_EMPTY_STRUCT_CTOR(scalar_isnan_op)
   typedef bool result_type;
-  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE result_type operator() (const Scalar& a) const { return numext::isNaN(a); }
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE result_type operator() (const Scalar& a) const { return numext::isnan(a); }
 };
 template<typename Scalar>
-struct functor_traits<scalar_isNaN_op<Scalar> >
+struct functor_traits<scalar_isnan_op<Scalar> >
 {
   enum {
     Cost = NumTraits<Scalar>::MulCost,
@@ -603,16 +603,16 @@ struct functor_traits<scalar_isNaN_op<Scalar> >
 };
 
 /** \internal
-  * \brief Template functor to compute the isInf of a scalar
-  * \sa class CwiseUnaryOp, ArrayBase::isInf()
+  * \brief Template functor to check whether a scalar is +/-inf
+  * \sa class CwiseUnaryOp, ArrayBase::isinf()
   */
-template<typename Scalar> struct scalar_isInf_op {
-  EIGEN_EMPTY_STRUCT_CTOR(scalar_isInf_op)
+template<typename Scalar> struct scalar_isinf_op {
+  EIGEN_EMPTY_STRUCT_CTOR(scalar_isinf_op)
   typedef bool result_type;
-  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE result_type operator() (const Scalar& a) const { return numext::isInf(a); }
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE result_type operator() (const Scalar& a) const { return numext::isinf(a); }
 };
 template<typename Scalar>
-struct functor_traits<scalar_isInf_op<Scalar> >
+struct functor_traits<scalar_isinf_op<Scalar> >
 {
   enum {
     Cost = NumTraits<Scalar>::MulCost,
@@ -621,16 +621,16 @@ struct functor_traits<scalar_isInf_op<Scalar> >
 };
 
 /** \internal
-  * \brief Template functor to compute the isFinite of a scalar
-  * \sa class CwiseUnaryOp, ArrayBase::isFinite()
+  * \brief Template functor to check whether a scalar has a finite value
+  * \sa class CwiseUnaryOp, ArrayBase::isfinite()
   */
-template<typename Scalar> struct scalar_isFinite_op {
-  EIGEN_EMPTY_STRUCT_CTOR(scalar_isFinite_op)
+template<typename Scalar> struct scalar_isfinite_op {
+  EIGEN_EMPTY_STRUCT_CTOR(scalar_isfinite_op)
   typedef bool result_type;
   EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE result_type operator() (const Scalar& a) const { return numext::isfinite(a); }
 };
 template<typename Scalar>
-struct functor_traits<scalar_isFinite_op<Scalar> >
+struct functor_traits<scalar_isfinite_op<Scalar> >
 {
   enum {
     Cost = NumTraits<Scalar>::MulCost,