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

---
 test/vectorization_logic.cpp | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'test/vectorization_logic.cpp')

diff --git a/test/vectorization_logic.cpp b/test/vectorization_logic.cpp
index 303eb6cf0..2f839cf51 100644
--- a/test/vectorization_logic.cpp
+++ b/test/vectorization_logic.cpp
@@ -45,22 +45,14 @@ std::string demangle_flags(int f)
 template<typename Dst, typename Src>
 bool test_assign(const Dst&, const Src&, int traversal, int unrolling)
 {
-#ifdef EIGEN_TEST_EVALUATORS
   typedef internal::copy_using_evaluator_traits<internal::evaluator<Dst>,internal::evaluator<Src>, internal::assign_op<typename Dst::Scalar> > traits;
-#else
-  typedef internal::assign_traits<Dst,Src> traits;
-#endif
   bool res = traits::Traversal==traversal && traits::Unrolling==unrolling;
   if(!res)
   {
     std::cerr << "Src: " << demangle_flags(Src::Flags) << std::endl;
-#ifdef EIGEN_TEST_EVALUATORS
     std::cerr << "     " << demangle_flags(internal::evaluator<Src>::Flags) << std::endl;
-#endif
     std::cerr << "Dst: " << demangle_flags(Dst::Flags) << std::endl;
-#ifdef EIGEN_TEST_EVALUATORS
     std::cerr << "     " << demangle_flags(internal::evaluator<Dst>::Flags) << std::endl;
-#endif
     traits::debug();
     std::cerr << " Expected Traversal == " << demangle_traversal(traversal)
               << " got " << demangle_traversal(traits::Traversal) << "\n";
@@ -73,22 +65,14 @@ bool test_assign(const Dst&, const Src&, int traversal, int unrolling)
 template<typename Dst, typename Src>
 bool test_assign(int traversal, int unrolling)
 {
-#ifdef EIGEN_TEST_EVALUATORS
   typedef internal::copy_using_evaluator_traits<internal::evaluator<Dst>,internal::evaluator<Src>, internal::assign_op<typename Dst::Scalar> > traits;
-#else
-  typedef internal::assign_traits<Dst,Src> traits;
-#endif
   bool res = traits::Traversal==traversal && traits::Unrolling==unrolling;
   if(!res)
   {
     std::cerr << "Src: " << demangle_flags(Src::Flags) << std::endl;
-#ifdef EIGEN_TEST_EVALUATORS
     std::cerr << "     " << demangle_flags(internal::evaluator<Src>::Flags) << std::endl;
-#endif
     std::cerr << "Dst: " << demangle_flags(Dst::Flags) << std::endl;
-#ifdef EIGEN_TEST_EVALUATORS
     std::cerr << "     " << demangle_flags(internal::evaluator<Dst>::Flags) << std::endl;
-#endif
     traits::debug();
     std::cerr << " Expected Traversal == " << demangle_traversal(traversal)
               << " got " << demangle_traversal(traits::Traversal) << "\n";
@@ -101,19 +85,13 @@ bool test_assign(int traversal, int unrolling)
 template<typename Xpr>
 bool test_redux(const Xpr&, int traversal, int unrolling)
 {
-#ifdef EIGEN_TEST_EVALUATORS
   typedef internal::redux_traits<internal::scalar_sum_op<typename Xpr::Scalar>,internal::redux_evaluator<Xpr> > traits;
-#else
-  typedef internal::redux_traits<internal::scalar_sum_op<typename Xpr::Scalar>,Xpr> traits;
-#endif
   
   bool res = traits::Traversal==traversal && traits::Unrolling==unrolling;
   if(!res)
   {
     std::cerr << demangle_flags(Xpr::Flags) << std::endl;
-#ifdef EIGEN_TEST_EVALUATORS
     std::cerr << demangle_flags(internal::evaluator<Xpr>::Flags) << std::endl;
-#endif
     traits::debug();
     
     std::cerr << " Expected Traversal == " << demangle_traversal(traversal)
-- 
cgit v1.2.3