GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-28 15:52:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a couple of warnings

Browse Source
This commit is contained in:
Gael Guennebaud 2012-02-27 14:27:12 +01:00
parent eb168ef8ed
commit ece30e9e6f
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/SparseCore/SparseSelfAdjointView.h
View File

@ -396,11 +396,11 @@ void permute_symm_to_symm(const MatrixType& mat, SparseMatrix<typename MatrixTyp
for(typename MatrixType::InnerIterator it(mat,j); it; ++it) for(typename MatrixType::InnerIterator it(mat,j); it; ++it)
{ {
Index i = it.index(); Index i = it.index();
if((SrcUpLo==Lower && i<j) || (SrcUpLo==Upper && i>j)) if((int(SrcUpLo)==int(Lower) && i<j) || (int(SrcUpLo)==int(Upper) && i>j))
continue; continue;
Index ip = perm ? perm[i] : i; Index ip = perm ? perm[i] : i;
count[DstUpLo==Lower ? (std::min)(ip,jp) : (std::max)(ip,jp)]++; count[int(DstUpLo)==int(Lower) ? (std::min)(ip,jp) : (std::max)(ip,jp)]++;
} }
} }
dest.outerIndexPtr()[0] = 0; dest.outerIndexPtr()[0] = 0;
@ -416,17 +416,17 @@ void permute_symm_to_symm(const MatrixType& mat, SparseMatrix<typename MatrixTyp
for(typename MatrixType::InnerIterator it(mat,j); it; ++it) for(typename MatrixType::InnerIterator it(mat,j); it; ++it)
{ {
Index i = it.index(); Index i = it.index();
if((SrcUpLo==Lower && i<j) || (SrcUpLo==Upper && i>j)) if((int(SrcUpLo)==int(Lower) && i<j) || (int(SrcUpLo)==int(Upper) && i>j))
continue; continue;
Index jp = perm ? perm[j] : j; Index jp = perm ? perm[j] : j;
Index ip = perm? perm[i] : i; Index ip = perm? perm[i] : i;
Index k = count[DstUpLo==Lower ? (std::min)(ip,jp) : (std::max)(ip,jp)]++; Index k = count[int(DstUpLo)==int(Lower) ? (std::min)(ip,jp) : (std::max)(ip,jp)]++;
dest.innerIndexPtr()[k] = DstUpLo==Lower ? (std::max)(ip,jp) : (std::min)(ip,jp); dest.innerIndexPtr()[k] = int(DstUpLo)==int(Lower) ? (std::max)(ip,jp) : (std::min)(ip,jp);
if(!StorageOrderMatch) std::swap(ip,jp); if(!StorageOrderMatch) std::swap(ip,jp);
if( ((DstUpLo==Lower && ip<jp) || (DstUpLo==Upper && ip>jp))) if( ((int(DstUpLo)==int(Lower) && ip<jp) || (int(DstUpLo)==int(Upper) && ip>jp)))
dest.valuePtr()[k] = conj(it.value()); dest.valuePtr()[k] = conj(it.value());
else else
dest.valuePtr()[k] = it.value(); dest.valuePtr()[k] = it.value();