diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-09-18 15:15:27 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-09-18 15:15:27 +0200 |
| commit | 0ca43f7e9a654e32da0066163a8656415961e266 (patch) | |
| tree | ed0da1fda3880f825eb8e9715546568deeee667f /Eigen/src/SparseCore/SparseDot.h | |
| parent | 8b3be4907da2cbf47ec15734b7f364e6e66bf4c3 (diff) | |
Remove deprecated code not used by evaluators
Diffstat (limited to 'Eigen/src/SparseCore/SparseDot.h')
| -rw-r--r-- | Eigen/src/SparseCore/SparseDot.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/Eigen/src/SparseCore/SparseDot.h b/Eigen/src/SparseCore/SparseDot.h index a63cb003c..b10c8058f 100644 --- a/Eigen/src/SparseCore/SparseDot.h +++ b/Eigen/src/SparseCore/SparseDot.h @@ -26,12 +26,8 @@ SparseMatrixBase<Derived>::dot(const MatrixBase<OtherDerived>& other) const eigen_assert(size() == other.size()); eigen_assert(other.size()>0 && "you are using a non initialized vector"); -#ifndef EIGEN_TEST_EVALUATORS - typename Derived::InnerIterator i(derived(),0); -#else typename internal::evaluator<Derived>::type thisEval(derived()); typename internal::evaluator<Derived>::InnerIterator i(thisEval, 0); -#endif Scalar res(0); while (i) { @@ -54,24 +50,12 @@ SparseMatrixBase<Derived>::dot(const SparseMatrixBase<OtherDerived>& other) cons eigen_assert(size() == other.size()); -#ifndef EIGEN_TEST_EVALUATORS - typedef typename Derived::Nested Nested; - typedef typename OtherDerived::Nested OtherNested; - typedef typename internal::remove_all<Nested>::type NestedCleaned; - typedef typename internal::remove_all<OtherNested>::type OtherNestedCleaned; - - Nested nthis(derived()); - OtherNested nother(other.derived()); - - typename NestedCleaned::InnerIterator i(nthis,0); - typename OtherNestedCleaned::InnerIterator j(nother,0); -#else typename internal::evaluator<Derived>::type thisEval(derived()); typename internal::evaluator<Derived>::InnerIterator i(thisEval, 0); typename internal::evaluator<OtherDerived>::type otherEval(other.derived()); typename internal::evaluator<OtherDerived>::InnerIterator j(otherEval, 0); -#endif + Scalar res(0); while (i && j) { |