diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-06-26 09:07:53 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-06-26 09:07:53 +0200 |
| commit | 3f49cf4c90e603fa6bae6e8640e8751d67b5d7fd (patch) | |
| tree | 44d4dd2c2b91d7b1fb77c5073eaa286bc2510d76 /test | |
| parent | 7f824dd613fe79e68efc4691972c30a5956bc0e6 (diff) | |
More msvc 2013/2015 workarounds
Diffstat (limited to 'test')
| -rw-r--r-- | test/array.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/array.cpp b/test/array.cpp index 158bf3d13..8cd4fd888 100644 --- a/test/array.cpp +++ b/test/array.cpp @@ -221,9 +221,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() == Eigen::isnan(m1)).all()); + VERIFY((m1.isInf() == Eigen::isinf(m1)).all()); + VERIFY((m1.isFinite() == Eigen::isfinite(m1)).all()); VERIFY_IS_APPROX(m1.inverse(), inverse(m1)); VERIFY_IS_APPROX(m1.abs(), abs(m1)); VERIFY_IS_APPROX(m1.abs2(), abs2(m1)); @@ -327,9 +327,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() == Eigen::isnan(m1)).all()); + VERIFY((m1.isInf() == Eigen::isinf(m1)).all()); + VERIFY((m1.isFinite() == Eigen::isfinite(m1)).all()); VERIFY_IS_APPROX(m1.inverse(), inverse(m1)); VERIFY_IS_APPROX(m1.log(), log(m1)); VERIFY_IS_APPROX(m1.log10(), log10(m1)); @@ -365,7 +365,7 @@ template<typename ArrayType> void array_complex(const ArrayType& m) } else { - VERIFY(isinf(m4.real()/zero.real()).all()); + VERIFY(Eigen::isinf(m4.real()/zero.real()).all()); } #endif VERIFY((Eigen::isfinite(m1) && (!Eigen::isfinite(m1*zero/zero)) && (!Eigen::isfinite(m1/zero))).all()); |