devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix miss use of hg resolve when backporting previous changeset

Browse Source
This commit is contained in:
Gael Guennebaud
2015-10-12 16:24:19 +02:00
parent 7aa90a3b0f
commit dc0ef2cbed
2 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Eigen/src/CholmodSupport/CholmodSupport.h
View File

@@ -78,11 +78,7 @@ cholmod_sparse viewAsCholmod(SparseMatrix<_Scalar,_Options,_Index>& mat)
{
res.itype = CHOLMOD_INT;
}
<<<<<<< local
else if (internal::is_same<_Index,UF_long>::value)
=======
else if (internal::is_same<_StorageIndex,SuiteSparse_long>::value)
>>>>>>> other
else if (internal::is_same<_Index,SuiteSparse_long>::value)
{
res.itype = CHOLMOD_LONG;
}