GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-11 19:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make more use of EIGEN_HAS_C99_MATH

Browse Source
This commit is contained in:
Gael Guennebaud 2015-06-10 16:26:55 +02:00
parent 93a62265dc
commit 9756c7fb4d
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Eigen/src/Core/MathFunctions.h
View File

@ -363,10 +363,8 @@ inline NewType cast(const OldType& x)
/**************************************************************************** /****************************************************************************
* Implementation of round * * Implementation of round *
****************************************************************************/ ****************************************************************************/
// In C++11 we can specialize round_impl for real Scalars
// Let's be conservative and enable the default C++11 implementation only if we are sure it exists #if EIGEN_HAS_C99_MATH
#if (__cplusplus >= 201103L) && (EIGEN_COMP_GNUC_STRICT || EIGEN_COMP_CLANG || EIGEN_COMP_MSVC || EIGEN_COMP_ICC) \
&& (EIGEN_ARCH_i386_OR_x86_64) && (EIGEN_OS_GNULINUX || EIGEN_OS_WIN_STRICT || EIGEN_OS_MAC)
template<typename Scalar> template<typename Scalar>
struct round_impl { struct round_impl {
static inline Scalar run(const Scalar& x) static inline Scalar run(const Scalar& x)
@ -376,7 +374,6 @@ inline NewType cast(const OldType& x)
return round(x); return round(x);
} }
}; };
// No C++11, use our own implementation
#else #else
template<typename Scalar> template<typename Scalar>
struct round_impl struct round_impl
@ -400,10 +397,8 @@ struct round_retval
/**************************************************************************** /****************************************************************************
* Implementation of arg * * Implementation of arg *
****************************************************************************/ ****************************************************************************/
// In C++11 we can specialize arg_impl for all Scalars
// Let's be conservative and enable the default C++11 implementation only if we are sure it exists #if EIGEN_HAS_C99_MATH
#if (__cplusplus >= 201103L) && (EIGEN_COMP_GNUC_STRICT || EIGEN_COMP_CLANG || EIGEN_COMP_MSVC || EIGEN_COMP_ICC) \
&& (EIGEN_ARCH_i386_OR_x86_64) && (EIGEN_OS_GNULINUX || EIGEN_OS_WIN_STRICT || EIGEN_OS_MAC)
template<typename Scalar> template<typename Scalar>
struct arg_impl { struct arg_impl {
static inline Scalar run(const Scalar& x) static inline Scalar run(const Scalar& x)
@ -412,8 +407,6 @@ struct round_retval
return arg(x); return arg(x);
} }
}; };
// No C++11, use our own implementation for real Scalars
#else #else
template<typename Scalar, bool IsComplex = NumTraits<Scalar>::IsComplex> template<typename Scalar, bool IsComplex = NumTraits<Scalar>::IsComplex>
struct arg_default_impl struct arg_default_impl
@ -462,10 +455,8 @@ struct log1p_impl
return ( x1p == Scalar(1) ) ? x : x * ( log(x1p) / (x1p - RealScalar(1)) ); return ( x1p == Scalar(1) ) ? x : x * ( log(x1p) / (x1p - RealScalar(1)) );
} }
}; };
// In C++11 we can specialize log1p_impl for real Scalars
// Let's be conservative and enable the default C++11 implementation only if we are sure it exists #ifdef EIGEN_HAS_C99_MATH
#if (__cplusplus >= 201103L) && (EIGEN_COMP_GNUC_STRICT || EIGEN_COMP_CLANG || EIGEN_COMP_MSVC || EIGEN_COMP_ICC) \
&& (EIGEN_ARCH_i386_OR_x86_64) && (EIGEN_OS_GNULINUX || EIGEN_OS_WIN_STRICT || EIGEN_OS_MAC)
template<typename Scalar> template<typename Scalar>
struct log1p_impl<Scalar, false> { struct log1p_impl<Scalar, false> {
static inline Scalar run(const Scalar& x) static inline Scalar run(const Scalar& x)

6
Eigen/src/Core/util/Macros.h
View File

@ -416,12 +416,10 @@
#endif #endif
// Does the compiler support C99 math? // Does the compiler support C99 math?
// Let's be conservative and enable the default C++11 implementation only if we are sure it exists
#if (__cplusplus >= 201103L) && (EIGEN_COMP_GNUC_STRICT || EIGEN_COMP_CLANG || EIGEN_COMP_MSVC || EIGEN_COMP_ICC) \ #if (__cplusplus >= 201103L) && (EIGEN_COMP_GNUC_STRICT || EIGEN_COMP_CLANG || EIGEN_COMP_MSVC || EIGEN_COMP_ICC) \
&& (EIGEN_ARCH_i386_OR_x86_64) && (EIGEN_OS_GNULINUX || EIGEN_OS_WIN_STRICT || EIGEN_OS_MAC) || \ && (EIGEN_ARCH_i386_OR_x86_64) && (EIGEN_OS_GNULINUX || EIGEN_OS_WIN_STRICT || EIGEN_OS_MAC) || \
(EIGEN_COMP_GNUC_STRICT || \ (EIGEN_COMP_GNUC_STRICT || (EIGEN_COMP_ICC && EIGEN_COMP_GNUC) || (EIGEN_COMP_CLANG) || (EIGEN_COMP_MSVC >= 1800))
(EIGEN_COMP_ICC && EIGEN_COMP_GNUC) || \
(EIGEN_COMP_CLANG) || \
(EIGEN_COMP_MSVC >= 1800))
#define EIGEN_HAS_C99_MATH 1 #define EIGEN_HAS_C99_MATH 1
#endif #endif