diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-04-11 17:20:17 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-04-11 17:20:17 -0700 |
| commit | d6e596174d09446236b3f398d8ec39148c638ed9 (patch) | |
| tree | ccb4116b05dc11d7931bac0129fd1394abe1e0b0 /test/main.h | |
| parent | 3ca1ae2bb761d7738bcdad885639f422a6b7c914 (diff) | |
| parent | 833efb39bfe4957934982112fe435ab30a0c3b4f (diff) | |
Pull latest updates from upstream
Diffstat (limited to 'test/main.h')
| -rw-r--r-- | test/main.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/main.h b/test/main.h index 2797e8623..bba5e7570 100644 --- a/test/main.h +++ b/test/main.h @@ -58,6 +58,10 @@ #define isnan(X) please_protect_your_isnan_with_parentheses #define isinf(X) please_protect_your_isinf_with_parentheses #define isfinite(X) please_protect_your_isfinite_with_parentheses +#ifdef M_PI +#undef M_PI +#endif +#define M_PI please_use_EIGEN_PI_instead_of_M_PI #define FORBIDDEN_IDENTIFIER (this_identifier_is_forbidden_to_avoid_clashes) this_identifier_is_forbidden_to_avoid_clashes // B0 is defined in POSIX header termios.h @@ -331,11 +335,13 @@ inline bool test_isApprox(const std::complex<double>& a, const std::complex<doub inline bool test_isMuchSmallerThan(const std::complex<double>& a, const std::complex<double>& b) { return internal::isMuchSmallerThan(a, b, test_precision<std::complex<double> >()); } +#ifndef EIGEN_TEST_NO_LONGDOUBLE inline bool test_isApprox(const std::complex<long double>& a, const std::complex<long double>& b) { return internal::isApprox(a, b, test_precision<std::complex<long double> >()); } inline bool test_isMuchSmallerThan(const std::complex<long double>& a, const std::complex<long double>& b) { return internal::isMuchSmallerThan(a, b, test_precision<std::complex<long double> >()); } #endif +#endif #ifndef EIGEN_TEST_NO_LONGDOUBLE inline bool test_isApprox(const long double& a, const long double& b) |