diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2018-10-15 09:22:27 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2018-10-15 09:22:27 +0200 |
| commit | 3a33db4de5a0ce0769c2869582db78a3962f8981 (patch) | |
| tree | a6166d9e92cbc4369edda2eabb7781beb001ee3e | |
| parent | 8214cf1896020a6361489dc8e8a331c0b3ecd6e0 (diff) | |
| parent | 0ed811a9c1e663a1125adbe1d5ce8c19491928ac (diff) | |
merge
| -rw-r--r-- | Eigen/src/SparseCore/SparseMatrix.h | 6 | ||||
| -rw-r--r-- | test/sparse_basic.cpp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Eigen/src/SparseCore/SparseMatrix.h b/Eigen/src/SparseCore/SparseMatrix.h index 8bfa5f6b8..eedae47e8 100644 --- a/Eigen/src/SparseCore/SparseMatrix.h +++ b/Eigen/src/SparseCore/SparseMatrix.h @@ -893,7 +893,7 @@ public: Index p = m_outerIndex[outer] + m_innerNonZeros[outer]++; m_data.index(p) = convert_index(inner); - return (m_data.value(p) = 0); + return (m_data.value(p) = Scalar(0)); } private: @@ -1274,7 +1274,7 @@ EIGEN_DONT_INLINE typename SparseMatrix<_Scalar,_Options,_StorageIndex>::Scalar& m_innerNonZeros[outer]++; m_data.index(p) = inner; - return (m_data.value(p) = 0); + return (m_data.value(p) = Scalar(0)); } template<typename _Scalar, int _Options, typename _StorageIndex> @@ -1381,7 +1381,7 @@ EIGEN_DONT_INLINE typename SparseMatrix<_Scalar,_Options,_StorageIndex>::Scalar& } m_data.index(p) = inner; - return (m_data.value(p) = 0); + return (m_data.value(p) = Scalar(0)); } namespace internal { diff --git a/test/sparse_basic.cpp b/test/sparse_basic.cpp index 199f9fdd3..53d4b8746 100644 --- a/test/sparse_basic.cpp +++ b/test/sparse_basic.cpp @@ -645,6 +645,7 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re template<typename SparseMatrixType> void big_sparse_triplet(Index rows, Index cols, double density) { + g_dense_op_sparse_count = 0; // Suppresses compiler warning. typedef typename SparseMatrixType::StorageIndex StorageIndex; typedef typename SparseMatrixType::Scalar Scalar; typedef Triplet<Scalar,Index> TripletType; |