diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-06-28 17:10:53 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-06-28 17:10:53 +0200 |
| commit | fc27cbd914b8afcf03b6120e3b23206bdc57b0a5 (patch) | |
| tree | 6037308c1a0f7fcea7e082b7ce467a753f008017 /Eigen/src/SparseCore | |
| parent | a915f0292ee8a4db2731638376ed0a55ca6930e4 (diff) | |
Fix bug #611: fix const qualifier in cwiseProduct(sparse,dense) and SparseDiagonalProduct::InnerIterator
Diffstat (limited to 'Eigen/src/SparseCore')
| -rw-r--r-- | Eigen/src/SparseCore/SparseDiagonalProduct.h | 16 | ||||
| -rw-r--r-- | Eigen/src/SparseCore/SparseMatrixBase.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Eigen/src/SparseCore/SparseDiagonalProduct.h b/Eigen/src/SparseCore/SparseDiagonalProduct.h index 5ec4018e6..3e314bcfc 100644 --- a/Eigen/src/SparseCore/SparseDiagonalProduct.h +++ b/Eigen/src/SparseCore/SparseDiagonalProduct.h @@ -118,13 +118,13 @@ class sparse_diagonal_product_inner_iterator_selector <Lhs,Rhs,SparseDiagonalProductType,SDP_IsDiagonal,SDP_IsSparseColMajor> : public CwiseBinaryOp< scalar_product_op<typename Lhs::Scalar>, - typename Rhs::ConstInnerVectorReturnType, - typename Lhs::DiagonalVectorType>::InnerIterator + const typename Rhs::ConstInnerVectorReturnType, + const typename Lhs::DiagonalVectorType>::InnerIterator { typedef typename CwiseBinaryOp< scalar_product_op<typename Lhs::Scalar>, - typename Rhs::ConstInnerVectorReturnType, - typename Lhs::DiagonalVectorType>::InnerIterator Base; + const typename Rhs::ConstInnerVectorReturnType, + const typename Lhs::DiagonalVectorType>::InnerIterator Base; typedef typename Lhs::Index Index; Index m_outer; public: @@ -156,13 +156,13 @@ class sparse_diagonal_product_inner_iterator_selector <Lhs,Rhs,SparseDiagonalProductType,SDP_IsSparseRowMajor,SDP_IsDiagonal> : public CwiseBinaryOp< scalar_product_op<typename Rhs::Scalar>, - typename Lhs::ConstInnerVectorReturnType, - Transpose<const typename Rhs::DiagonalVectorType> >::InnerIterator + const typename Lhs::ConstInnerVectorReturnType, + const Transpose<const typename Rhs::DiagonalVectorType> >::InnerIterator { typedef typename CwiseBinaryOp< scalar_product_op<typename Rhs::Scalar>, - typename Lhs::ConstInnerVectorReturnType, - Transpose<const typename Rhs::DiagonalVectorType> >::InnerIterator Base; + const typename Lhs::ConstInnerVectorReturnType, + const Transpose<const typename Rhs::DiagonalVectorType> >::InnerIterator Base; typedef typename Lhs::Index Index; Index m_outer; public: diff --git a/Eigen/src/SparseCore/SparseMatrixBase.h b/Eigen/src/SparseCore/SparseMatrixBase.h index 6c73b7172..90fee01bc 100644 --- a/Eigen/src/SparseCore/SparseMatrixBase.h +++ b/Eigen/src/SparseCore/SparseMatrixBase.h @@ -322,8 +322,8 @@ template<typename Derived> class SparseMatrixBase : public EigenBase<Derived> typename internal::traits<OtherDerived>::Scalar \ >::ReturnType \ >, \ - Derived, \ - OtherDerived \ + const Derived, \ + const OtherDerived \ > template<typename OtherDerived> |