diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-07-04 11:49:03 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-07-04 11:49:03 +0200 |
| commit | e61cee7a500d35e50f7ae9c5b05c4bd255948292 (patch) | |
| tree | 30491f565483e380d2efffa7e00802d327771c9f /test | |
| parent | 91b303901307b8bcebaea3211d26e13422121e78 (diff) | |
Fix compilation of some unit tests with msvc
Diffstat (limited to 'test')
| -rw-r--r-- | test/array.cpp | 2 | ||||
| -rw-r--r-- | test/mixingtypes.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/array.cpp b/test/array.cpp index 7e41e9e20..6347c8067 100644 --- a/test/array.cpp +++ b/test/array.cpp @@ -117,7 +117,7 @@ template<typename ArrayType> void array(const ArrayType& m) VERIFY_IS_APPROX((2*m1).pow(exponents), 4*m1.square()); VERIFY_IS_APPROX(Eigen::pow(m1,2*exponents), m1.square().square()); VERIFY_IS_APPROX(m1.pow(2*exponents), m1.square().square()); - VERIFY_IS_APPROX(pow(m1(0,0), exponents), ArrayType::Constant(rows,cols,m1(0,0)*m1(0,0))); + VERIFY_IS_APPROX(Eigen::pow(m1(0,0), exponents), ArrayType::Constant(rows,cols,m1(0,0)*m1(0,0))); // Check possible conflicts with 1D ctor typedef Array<Scalar, Dynamic, 1> OneDArrayType; diff --git a/test/mixingtypes.cpp b/test/mixingtypes.cpp index 57ef85c32..dc092e3d3 100644 --- a/test/mixingtypes.cpp +++ b/test/mixingtypes.cpp @@ -103,12 +103,12 @@ template<int SizeAtCompileType> void mixingtypes(int size = SizeAtCompileType) VERIFY_MIX_SCALAR(scd - vd.array() , scd - vd.template cast<complex<double> >().array()); // check scalar powers - VERIFY_MIX_SCALAR( pow(vcf.array(), sf), pow(vcf.array(), complex<float>(sf)) ); - VERIFY_MIX_SCALAR( vcf.array().pow(sf) , pow(vcf.array(), complex<float>(sf)) ); - VERIFY_MIX_SCALAR( pow(sd, vcd.array()), pow(complex<double>(sd), vcd.array()) ); - VERIFY_MIX_SCALAR( pow(vf.array(), scf), pow(vf.template cast<complex<float> >().array(), scf) ); - VERIFY_MIX_SCALAR( vf.array().pow(scf) , pow(vf.template cast<complex<float> >().array(), scf) ); - VERIFY_MIX_SCALAR( pow(scd, vd.array()), pow(scd, vd.template cast<complex<double> >().array()) ); + VERIFY_MIX_SCALAR( pow(vcf.array(), sf), Eigen::pow(vcf.array(), complex<float>(sf)) ); + VERIFY_MIX_SCALAR( vcf.array().pow(sf) , Eigen::pow(vcf.array(), complex<float>(sf)) ); + VERIFY_MIX_SCALAR( pow(sd, vcd.array()), Eigen::pow(complex<double>(sd), vcd.array()) ); + VERIFY_MIX_SCALAR( Eigen::pow(vf.array(), scf), Eigen::pow(vf.template cast<complex<float> >().array(), scf) ); + VERIFY_MIX_SCALAR( vf.array().pow(scf) , Eigen::pow(vf.template cast<complex<float> >().array(), scf) ); + VERIFY_MIX_SCALAR( Eigen::pow(scd, vd.array()), Eigen::pow(scd, vd.template cast<complex<double> >().array()) ); // check dot product vf.dot(vf); |