From 0ca43f7e9a654e32da0066163a8656415961e266 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Thu, 18 Sep 2014 15:15:27 +0200
Subject: Remove deprecated code not used by evaluators

---
 Eigen/src/Core/MatrixBase.h | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

(limited to 'Eigen/src/Core/MatrixBase.h')

diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h
index bb49b9e84..9dbbd6fb5 100644
--- a/Eigen/src/Core/MatrixBase.h
+++ b/Eigen/src/Core/MatrixBase.h
@@ -66,9 +66,6 @@ template<typename Derived> class MatrixBase
     using Base::MaxSizeAtCompileTime;
     using Base::IsVectorAtCompileTime;
     using Base::Flags;
-#ifndef EIGEN_TEST_EVALUATORS
-    using Base::CoeffReadCost;
-#endif
     
     using Base::derived;
     using Base::const_cast_derived;
@@ -188,25 +185,15 @@ template<typename Derived> class MatrixBase
     { return this->lazyProduct(other); }
 #else
 
-#ifdef EIGEN_TEST_EVALUATORS
     template<typename OtherDerived>
     const Product<Derived,OtherDerived>
     operator*(const MatrixBase<OtherDerived> &other) const;
-#else
-    template<typename OtherDerived>
-    const typename ProductReturnType<Derived,OtherDerived>::Type
-    operator*(const MatrixBase<OtherDerived> &other) const;
-#endif
 
 #endif
 
     template<typename OtherDerived>
     EIGEN_DEVICE_FUNC 
-#ifdef EIGEN_TEST_EVALUATORS
     const Product<Derived,OtherDerived,LazyProduct>
-#else
-    const typename LazyProductReturnType<Derived,OtherDerived>::Type
-#endif
     lazyProduct(const MatrixBase<OtherDerived> &other) const;
 
     template<typename OtherDerived>
@@ -218,17 +205,10 @@ template<typename Derived> class MatrixBase
     template<typename OtherDerived>
     void applyOnTheRight(const EigenBase<OtherDerived>& other);
 
-#ifndef EIGEN_TEST_EVALUATORS
-    template<typename DiagonalDerived>
-    EIGEN_DEVICE_FUNC
-    const DiagonalProduct<Derived, DiagonalDerived, OnTheRight>
-    operator*(const DiagonalBase<DiagonalDerived> &diagonal) const;
-#else // EIGEN_TEST_EVALUATORS
     template<typename DiagonalDerived>
     EIGEN_DEVICE_FUNC
     const Product<Derived, DiagonalDerived, LazyProduct>
     operator*(const DiagonalBase<DiagonalDerived> &diagonal) const;
-#endif // EIGEN_TEST_EVALUATORS
 
     template<typename OtherDerived>
     EIGEN_DEVICE_FUNC
@@ -347,19 +327,12 @@ template<typename Derived> class MatrixBase
 
     NoAlias<Derived,Eigen::MatrixBase > noalias();
 
-#ifndef EIGEN_TEST_EVALUATORS
-    inline const ForceAlignedAccess<Derived> forceAlignedAccess() const;
-    inline ForceAlignedAccess<Derived> forceAlignedAccess();
-    template<bool Enable> inline typename internal::add_const_on_value_type<typename internal::conditional<Enable,ForceAlignedAccess<Derived>,Derived&>::type>::type forceAlignedAccessIf() const;
-    template<bool Enable> inline typename internal::conditional<Enable,ForceAlignedAccess<Derived>,Derived&>::type forceAlignedAccessIf();
-#else
     // TODO forceAlignedAccess is temporarly disabled
     // Need to find a nicer workaround.
     inline const Derived& forceAlignedAccess() const { return derived(); }
     inline Derived& forceAlignedAccess() { return derived(); }
     template<bool Enable> inline const Derived& forceAlignedAccessIf() const { return derived(); }
     template<bool Enable> inline Derived& forceAlignedAccessIf() { return derived(); }
-#endif
 
     Scalar trace() const;
 
@@ -382,13 +355,9 @@ template<typename Derived> class MatrixBase
 
     const PartialPivLU<PlainObject> lu() const;
 
-    #ifdef EIGEN_TEST_EVALUATORS
     EIGEN_DEVICE_FUNC
     const Inverse<Derived> inverse() const;
-    #else
-    EIGEN_DEVICE_FUNC
-    const internal::inverse_impl<Derived> inverse() const;
-    #endif
+    
     template<typename ResultType>
     void computeInverseAndDetWithCheck(
       ResultType& inverse,
-- 
cgit v1.2.3