devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #611: fix const qualifier in cwiseProduct(sparse,dense) and SparseDiagonalProduct::InnerIterator

Browse Source
This commit is contained in:
Gael Guennebaud
2013-06-28 17:10:53 +02:00
parent a915f0292e
commit fc27cbd914
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Eigen/src/SparseCore/SparseDiagonalProduct.h
View File

@@ -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:

4
Eigen/src/SparseCore/SparseMatrixBase.h
View File

@@ -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>