diff options
author | 2009-12-12 11:39:07 +0100 | |
---|---|---|
committer | 2009-12-12 11:39:07 +0100 | |
commit | d088ee35f644f9178270f0c3dc8c76011d208099 (patch) | |
tree | 47001aacbb83eba02c38d93ec97fbe09e7c8497c /Eigen/src/Sparse/SparseMatrix.h | |
parent | 494a88685ee995b34da0f3b79a68fa06c0ee63ff (diff) |
Added to possibility to compile unit tests at maximum warning level.
Silenced (amongst others) many conversion related warnings.
Diffstat (limited to 'Eigen/src/Sparse/SparseMatrix.h')
-rw-r--r-- | Eigen/src/Sparse/SparseMatrix.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Eigen/src/Sparse/SparseMatrix.h b/Eigen/src/Sparse/SparseMatrix.h index 36fa123fb..e1c740cdb 100644 --- a/Eigen/src/Sparse/SparseMatrix.h +++ b/Eigen/src/Sparse/SparseMatrix.h @@ -138,7 +138,7 @@ class SparseMatrix } /** \returns the number of non zero coefficients */ - inline int nonZeros() const { return m_data.size(); } + inline int nonZeros() const { return static_cast<int>(m_data.size()); } /** \deprecated use setZero() and reserve() * Initializes the filling process of \c *this. @@ -236,7 +236,7 @@ class SparseMatrix // we start a new inner vector while (previousOuter>=0 && m_outerIndex[previousOuter]==0) { - m_outerIndex[previousOuter] = m_data.size(); + m_outerIndex[previousOuter] = static_cast<int>(m_data.size()); --previousOuter; } m_outerIndex[outer+1] = m_outerIndex[outer]; @@ -335,7 +335,7 @@ class SparseMatrix */ inline void finalize() { - int size = m_data.size(); + int size = static_cast<int>(m_data.size()); int i = m_outerSize; // find the last filled column while (i>=0 && m_outerIndex[i]==0) @@ -557,6 +557,9 @@ class SparseMatrix<Scalar,_Options>::InnerIterator int m_id; const int m_start; const int m_end; + + private: + InnerIterator& operator=(const InnerIterator&); }; #endif // EIGEN_SPARSEMATRIX_H |