diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-02-13 18:57:41 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-02-13 18:57:41 +0100 |
| commit | fc202bab398ed9b78ef8452f8e4ef35e233965f6 (patch) | |
| tree | f0f427ee115aa8579b0d43a49c2ad762b1b0f57c /Eigen/src/SparseCore/SparseTranspose.h | |
| parent | fe513199808654bfa5080fe16bda7dcdafbd57c6 (diff) | |
Index refactoring: StorageIndex must be used for storage only (and locally when it make sense). In all other cases use the global Index type.
Diffstat (limited to 'Eigen/src/SparseCore/SparseTranspose.h')
| -rw-r--r-- | Eigen/src/SparseCore/SparseTranspose.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Eigen/src/SparseCore/SparseTranspose.h b/Eigen/src/SparseCore/SparseTranspose.h index 84413c374..45d9c6700 100644 --- a/Eigen/src/SparseCore/SparseTranspose.h +++ b/Eigen/src/SparseCore/SparseTranspose.h @@ -48,7 +48,7 @@ template<typename MatrixType> class TransposeImpl<MatrixType,Sparse> protected: typedef internal::SparseTransposeImpl<MatrixType> Base; public: - inline typename MatrixType::StorageIndex nonZeros() const { return Base::derived().nestedExpression().nonZeros(); } + inline Index nonZeros() const { return Base::derived().nestedExpression().nonZeros(); } }; namespace internal { @@ -61,7 +61,6 @@ struct unary_evaluator<Transpose<ArgType>, IteratorBased> typedef typename evaluator<ArgType>::ReverseInnerIterator EvalReverseIterator; public: typedef Transpose<ArgType> XprType; - typedef typename XprType::StorageIndex StorageIndex; class InnerIterator : public EvalIterator { @@ -70,8 +69,8 @@ struct unary_evaluator<Transpose<ArgType>, IteratorBased> : EvalIterator(unaryOp.m_argImpl,outer) {} - StorageIndex row() const { return EvalIterator::col(); } - StorageIndex col() const { return EvalIterator::row(); } + Index row() const { return EvalIterator::col(); } + Index col() const { return EvalIterator::row(); } }; class ReverseInnerIterator : public EvalReverseIterator @@ -81,8 +80,8 @@ struct unary_evaluator<Transpose<ArgType>, IteratorBased> : EvalReverseIterator(unaryOp.m_argImpl,outer) {} - StorageIndex row() const { return EvalReverseIterator::col(); } - StorageIndex col() const { return EvalReverseIterator::row(); } + Index row() const { return EvalReverseIterator::col(); } + Index col() const { return EvalReverseIterator::row(); } }; enum { |