aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/evaluators.cpp
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2013-12-02 14:44:13 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2013-12-02 14:44:13 +0100
commitc6f73370327e2e91a45ac13e7bbb6c7567179e49 (patch)
treedbd3b2e33ee0c6996e877ada8f96e6dac793223a /test/evaluators.cpp
parent626821b0e34a624e8fa8980339b771e155722ace (diff)
Get rid of call_dense_swap_loop
Diffstat (limited to 'test/evaluators.cpp')
-rw-r--r--test/evaluators.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/evaluators.cpp b/test/evaluators.cpp
index 29192d7f9..63f940318 100644
--- a/test/evaluators.cpp
+++ b/test/evaluators.cpp
@@ -74,7 +74,8 @@ namespace Eigen {
template<typename DstXprType, typename SrcXprType>
void swap_using_evaluator(const DstXprType& dst, const SrcXprType& src)
{
- call_dense_swap_loop(dst.const_cast_derived(), src.const_cast_derived());
+ typedef typename DstXprType::Scalar Scalar;
+ call_assignment(dst.const_cast_derived(), src.const_cast_derived(), internal::swap_assign_op<Scalar>());
}
}
@@ -193,7 +194,7 @@ void test_evaluators()
VERIFY_IS_APPROX_EVALUATOR2(resXX, prod(mX4,m4X), mX4*m4X);
VERIFY_IS_APPROX_EVALUATOR2(resXX, prod(mXX,mXX), mXX*mXX);
}
-
+#endif
{
ArrayXXf a(2,3);
ArrayXXf b(3,2);
@@ -202,7 +203,7 @@ void test_evaluators()
// this does not work because Random is eval-before-nested:
// copy_using_evaluator(w, Vector2d::Random().transpose());
-
+
// test CwiseUnaryOp
VERIFY_IS_APPROX_EVALUATOR(v2, 3 * v);
VERIFY_IS_APPROX_EVALUATOR(w, (3 * v).transpose());
@@ -405,7 +406,7 @@ void test_evaluators()
arr_ref.row(1) /= (arr_ref.row(2) + 1);
VERIFY_IS_APPROX(arr, arr_ref);
}
-#endif
+
{
// test triangular shapes
MatrixXd A = MatrixXd::Random(6,6), B(6,6), C(6,6);