Rationalize the use of Index type in iterators

This commit is contained in:
Gael Guennebaud
2013-07-06 22:05:49 +02:00
parent 9b833aff42
commit 4f28ccdd0e
5 changed files with 11 additions and 5 deletions

View File

@@ -34,26 +34,28 @@ template<typename MatrixType> class TransposeImpl<MatrixType,Sparse>::InnerItera
: public _MatrixTypeNested::InnerIterator
{
typedef typename _MatrixTypeNested::InnerIterator Base;
typedef typename TransposeImpl::Index Index;
public:
EIGEN_STRONG_INLINE InnerIterator(const TransposeImpl& trans, typename TransposeImpl<MatrixType,Sparse>::Index outer)
: Base(trans.derived().nestedExpression(), outer)
{}
inline typename TransposeImpl<MatrixType,Sparse>::Index row() const { return Base::col(); }
inline typename TransposeImpl<MatrixType,Sparse>::Index col() const { return Base::row(); }
Index row() const { return Base::col(); }
Index col() const { return Base::row(); }
};
template<typename MatrixType> class TransposeImpl<MatrixType,Sparse>::ReverseInnerIterator
: public _MatrixTypeNested::ReverseInnerIterator
{
typedef typename _MatrixTypeNested::ReverseInnerIterator Base;
typedef typename TransposeImpl::Index Index;
public:
EIGEN_STRONG_INLINE ReverseInnerIterator(const TransposeImpl& xpr, typename TransposeImpl<MatrixType,Sparse>::Index outer)
: Base(xpr.derived().nestedExpression(), outer)
{}
inline typename TransposeImpl<MatrixType,Sparse>::Index row() const { return Base::col(); }
inline typename TransposeImpl<MatrixType,Sparse>::Index col() const { return Base::row(); }
Index row() const { return Base::col(); }
Index col() const { return Base::row(); }
};
} // end namespace Eigen