diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2009-05-18 18:26:45 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2009-05-18 18:26:45 +0200 |
| commit | b83d9b48fa07653ffaabf37eadf8fc5f01fc1da0 (patch) | |
| tree | cba3f669ee244ac5a250dc396c5aca0ad4a60239 /Eigen/src | |
| parent | c8629e12f4260bcf11f1f94329115729f19a0ce8 (diff) | |
fix compilation with ICC
Diffstat (limited to 'Eigen/src')
| -rw-r--r-- | Eigen/src/Sparse/SparseBlock.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Sparse/SparseBlock.h b/Eigen/src/Sparse/SparseBlock.h index 86567f1a5..72589d0c0 100644 --- a/Eigen/src/Sparse/SparseBlock.h +++ b/Eigen/src/Sparse/SparseBlock.h @@ -150,15 +150,15 @@ class SparseInnerVectorSet<DynamicSparseMatrix<_Scalar, _Options>, Size> { return operator=<SparseInnerVectorSet>(other); } - + int nonZeros() const - { + { int count = 0; for (int j=0; j<m_outerSize; ++j) count += m_matrix._data()[m_outerStart+j].size(); return count; } - + const Scalar& lastCoeff() const { EIGEN_STATIC_ASSERT_VECTOR_ONLY(SparseInnerVectorSet); @@ -212,7 +212,7 @@ class SparseInnerVectorSet<SparseMatrix<_Scalar, _Options>, Size> } inline SparseInnerVectorSet(const MatrixType& matrix, int outer) - : m_matrix(matrix), m_outerStart(outer) + : m_matrix(matrix), m_outerStart(outer), m_outerSize(Size) { ei_assert(Size==1); ei_assert( (outer>=0) && (outer<matrix.outerSize()) ); @@ -250,12 +250,12 @@ class SparseInnerVectorSet<SparseMatrix<_Scalar, _Options>, Size> { return m_matrix._innerIndexPtr() + m_matrix._outerIndexPtr()[m_outerStart]; } inline const int* _outerIndexPtr() const { return m_matrix._outerIndexPtr() + m_outerStart; } - + int nonZeros() const { return size_t(m_matrix._outerIndexPtr()[m_outerStart+m_outerSize.value()]) - size_t(m_matrix._outerIndexPtr()[m_outerStart]); } - + const Scalar& lastCoeff() const { EIGEN_STATIC_ASSERT_VECTOR_ONLY(SparseInnerVectorSet); |