aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2015-04-18 22:50:16 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2015-04-18 22:50:16 +0200
commitfc2d5b86ce2f3c35c3285348066ec22cc149de86 (patch)
tree0855b5c6bcec7b82a5f9e4c4f3775c3f0b389b0a
parent5a3c48e3c6c6a3966b68f715610e0eaafa906b2a (diff)
simplify previous changeset: sub-expressions are nested by value
-rw-r--r--Eigen/src/SparseCore/SparseDiagonalProduct.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/Eigen/src/SparseCore/SparseDiagonalProduct.h b/Eigen/src/SparseCore/SparseDiagonalProduct.h
index fdc4bd495..29a67da35 100644
--- a/Eigen/src/SparseCore/SparseDiagonalProduct.h
+++ b/Eigen/src/SparseCore/SparseDiagonalProduct.h
@@ -107,8 +107,7 @@ struct sparse_diagonal_product_evaluator<SparseXprType, DiagCoeffType, SDP_AsCwi
{
public:
InnerIterator(const sparse_diagonal_product_evaluator &xprEval, Index outer)
- : m_innerVectorXpr(xprEval.m_sparseXprNested.innerVector(outer)),
- m_cwiseXpr(m_innerVectorXpr.cwiseProduct(xprEval.m_diagCoeffNested)),
+ : m_cwiseXpr(xprEval.m_sparseXprNested.innerVector(outer).cwiseProduct(xprEval.m_diagCoeffNested)),
m_cwiseEval(m_cwiseXpr),
m_cwiseIter(m_cwiseEval, 0),
m_outer(outer)
@@ -125,7 +124,6 @@ struct sparse_diagonal_product_evaluator<SparseXprType, DiagCoeffType, SDP_AsCwi
inline operator bool() const { return m_cwiseIter; }
protected:
- const typename SparseXprType::ConstInnerVectorReturnType m_innerVectorXpr;
const CwiseProductType m_cwiseXpr;
CwiseProductEval m_cwiseEval;
CwiseProductIterator m_cwiseIter;