diff options
author | Gael Guennebaud <g.gael@free.fr> | 2015-04-02 22:21:41 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2015-04-02 22:21:41 +0200 |
commit | 15b5adb327e4cdb571990d1a3daf33df9e38125b (patch) | |
tree | 90a4f3b96bada036ae262dda93c9bc2b8f409bb0 /Eigen/src/SuperLUSupport | |
parent | 03a0df20100d2b89b38a70d3b0b7a15a4a44b5de (diff) |
Fix regression in DynamicSparseMatrix and SuperLUSupport wrt recent change on nonZeros/nonZerosEstimate
Diffstat (limited to 'Eigen/src/SuperLUSupport')
-rw-r--r-- | Eigen/src/SuperLUSupport/SuperLUSupport.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Eigen/src/SuperLUSupport/SuperLUSupport.h b/Eigen/src/SuperLUSupport/SuperLUSupport.h index b9d5e48fb..1bbd2758e 100644 --- a/Eigen/src/SuperLUSupport/SuperLUSupport.h +++ b/Eigen/src/SuperLUSupport/SuperLUSupport.h @@ -165,8 +165,9 @@ struct SluMatrix : SuperMatrix } template<typename MatrixType> - static SluMatrix Map(SparseMatrixBase<MatrixType>& mat) + static SluMatrix Map(SparseMatrixBase<MatrixType>& a_mat) { + MatrixType &mat(a_mat.derived()); SluMatrix res; if ((MatrixType::Flags&RowMajorBit)==RowMajorBit) { @@ -184,9 +185,9 @@ struct SluMatrix : SuperMatrix res.Mtype = SLU_GE; res.storage.nnz = internal::convert_index<int>(mat.nonZeros()); - res.storage.values = mat.derived().valuePtr(); - res.storage.innerInd = mat.derived().innerIndexPtr(); - res.storage.outerInd = mat.derived().outerIndexPtr(); + res.storage.values = mat.valuePtr(); + res.storage.innerInd = mat.innerIndexPtr(); + res.storage.outerInd = mat.outerIndexPtr(); res.setScalarType<typename MatrixType::Scalar>(); |