From 47829e2d16c2bc4fba6aef8fd1b7712a9db839eb Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Mon, 1 Sep 2014 18:32:59 +0200
Subject: Disable solve_ret_val like mechanism with evaluator enabled

---
 Eigen/src/misc/Solve.h       | 4 +++-
 Eigen/src/misc/SparseSolve.h | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'Eigen/src/misc')

diff --git a/Eigen/src/misc/Solve.h b/Eigen/src/misc/Solve.h
index 7f70d60af..ebdd981d0 100644
--- a/Eigen/src/misc/Solve.h
+++ b/Eigen/src/misc/Solve.h
@@ -10,6 +10,8 @@
 #ifndef EIGEN_MISC_SOLVE_H
 #define EIGEN_MISC_SOLVE_H
 
+#ifndef EIGEN_TEST_EVALUATORS
+
 namespace Eigen { 
 
 namespace internal {
@@ -72,5 +74,5 @@ template<typename _DecompositionType, typename Rhs> struct solve_retval_base
     : Base(dec, rhs) {}
 
 } // end namespace Eigen
-
+#endif // EIGEN_TEST_EVALUATORS
 #endif // EIGEN_MISC_SOLVE_H
diff --git a/Eigen/src/misc/SparseSolve.h b/Eigen/src/misc/SparseSolve.h
index 05caa9266..2396dc8e8 100644
--- a/Eigen/src/misc/SparseSolve.h
+++ b/Eigen/src/misc/SparseSolve.h
@@ -10,6 +10,8 @@
 #ifndef EIGEN_SPARSE_SOLVE_H
 #define EIGEN_SPARSE_SOLVE_H
 
+#ifndef EIGEN_TEST_EVALUATORS
+
 namespace Eigen { 
 
 namespace internal {
@@ -127,4 +129,6 @@ template<typename DecompositionType, typename Rhs, typename Guess> struct solve_
 
 } // end namespace Eigen
 
+#endif // EIGEN_TEST_EVALUATORS
+
 #endif // EIGEN_SPARSE_SOLVE_H
-- 
cgit v1.2.3