GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation with ICC

Browse Source
This commit is contained in:
Gael Guennebaud 2009-05-18 18:26:45 +02:00
parent c8629e12f4
commit b83d9b48fa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Eigen/src/Sparse/SparseBlock.h
View File

@ -150,15 +150,15 @@ class SparseInnerVectorSet<DynamicSparseMatrix<_Scalar, _Options>, Size>
{ {
return operator=<SparseInnerVectorSet>(other); return operator=<SparseInnerVectorSet>(other);
} }
int nonZeros() const int nonZeros() const
{ {
int count = 0; int count = 0;
for (int j=0; j<m_outerSize; ++j) for (int j=0; j<m_outerSize; ++j)
count += m_matrix._data()[m_outerStart+j].size(); count += m_matrix._data()[m_outerStart+j].size();
return count; return count;
} }
const Scalar& lastCoeff() const const Scalar& lastCoeff() const
{ {
EIGEN_STATIC_ASSERT_VECTOR_ONLY(SparseInnerVectorSet); EIGEN_STATIC_ASSERT_VECTOR_ONLY(SparseInnerVectorSet);
@ -212,7 +212,7 @@ class SparseInnerVectorSet<SparseMatrix<_Scalar, _Options>, Size>
} }
inline SparseInnerVectorSet(const MatrixType& matrix, int outer) 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(Size==1);
ei_assert( (outer>=0) && (outer<matrix.outerSize()) ); 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]; } { return m_matrix._innerIndexPtr() + m_matrix._outerIndexPtr()[m_outerStart]; }
inline const int* _outerIndexPtr() const inline const int* _outerIndexPtr() const
{ return m_matrix._outerIndexPtr() + m_outerStart; } { return m_matrix._outerIndexPtr() + m_outerStart; }
int nonZeros() const int nonZeros() const
{ {
return size_t(m_matrix._outerIndexPtr()[m_outerStart+m_outerSize.value()]) return size_t(m_matrix._outerIndexPtr()[m_outerStart+m_outerSize.value()])
- size_t(m_matrix._outerIndexPtr()[m_outerStart]); } - size_t(m_matrix._outerIndexPtr()[m_outerStart]); }
const Scalar& lastCoeff() const const Scalar& lastCoeff() const
{ {
EIGEN_STATIC_ASSERT_VECTOR_ONLY(SparseInnerVectorSet); EIGEN_STATIC_ASSERT_VECTOR_ONLY(SparseInnerVectorSet);