diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/array_cwise.cpp | 6 | ||||
-rw-r--r-- | test/main.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/test/array_cwise.cpp b/test/array_cwise.cpp index 9e4adb701..ae0f9f97c 100644 --- a/test/array_cwise.cpp +++ b/test/array_cwise.cpp @@ -342,7 +342,7 @@ template<typename ArrayType> void array_real(const ArrayType& m) VERIFY_IS_APPROX(m1.sign() * m1.abs(), m1); VERIFY_IS_APPROX(numext::abs2(numext::real(m1)) + numext::abs2(numext::imag(m1)), numext::abs2(m1)); - VERIFY_IS_APPROX(numext::abs2(real(m1)) + numext::abs2(imag(m1)), numext::abs2(m1)); + VERIFY_IS_APPROX(numext::abs2(Eigen::real(m1)) + numext::abs2(Eigen::imag(m1)), numext::abs2(m1)); if(!NumTraits<Scalar>::IsComplex) VERIFY_IS_APPROX(numext::real(m1), m1); @@ -436,7 +436,7 @@ template<typename ArrayType> void array_complex(const ArrayType& m) for (Index i = 0; i < m.rows(); ++i) for (Index j = 0; j < m.cols(); ++j) - m3(i,j) = std::atan2(imag(m1(i,j)), real(m1(i,j))); + m3(i,j) = std::atan2(m1(i,j).imag(), m1(i,j).real()); VERIFY_IS_APPROX(arg(m1), m3); std::complex<RealScalar> zero(0.0,0.0); @@ -463,7 +463,7 @@ template<typename ArrayType> void array_complex(const ArrayType& m) VERIFY_IS_APPROX(inverse(inverse(m1)),m1); VERIFY_IS_APPROX(conj(m1.conjugate()), m1); - VERIFY_IS_APPROX(abs(m1), sqrt(square(real(m1))+square(imag(m1)))); + VERIFY_IS_APPROX(abs(m1), sqrt(square(m1.real())+square(m1.imag()))); VERIFY_IS_APPROX(abs(m1), sqrt(abs2(m1))); VERIFY_IS_APPROX(log10(m1), log(m1)/log(10)); diff --git a/test/main.h b/test/main.h index 4c1733b1f..54553f742 100644 --- a/test/main.h +++ b/test/main.h @@ -91,6 +91,11 @@ #define isfinite(X) please_protect_your_isfinite_with_parentheses #endif + +// test possible conflicts +struct real {}; +struct imag {}; + #ifdef M_PI #undef M_PI #endif |