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

Fixes min() warnings.

Browse Source
This commit is contained in:
Robert Lukierski 2016-10-12 18:59:05 +01:00
parent 86711497c4
commit 471075f7ad
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Core/AssignEvaluator.h
View File

@ -555,7 +555,7 @@ struct dense_assignment_loop<Kernel, SliceVectorizedTraversal, NoUnrolling>
for(Index inner = alignedEnd; inner<innerSize ; ++inner) for(Index inner = alignedEnd; inner<innerSize ; ++inner)
kernel.assignCoeffByOuterInner(outer, inner); kernel.assignCoeffByOuterInner(outer, inner);
alignedStart = min((Index)(alignedStart+alignedStep)%packetSize, (Index)innerSize); alignedStart = (min)((Index)(alignedStart+alignedStep)%packetSize, (Index)innerSize);
} }
} }
}; };

2
Eigen/src/Core/CwiseNullaryOp.h
View File

@ -753,7 +753,7 @@ struct setIdentity_impl<Derived, true>
{ {
m.setZero(); m.setZero();
EIGEN_USING_STD_MATH(min) EIGEN_USING_STD_MATH(min)
const Index size = min(m.rows(), m.cols()); const Index size = (min)(m.rows(), m.cols());
for(Index i = 0; i < size; ++i) m.coeffRef(i,i) = typename Derived::Scalar(1); for(Index i = 0; i < size; ++i) m.coeffRef(i,i) = typename Derived::Scalar(1);
return m; return m;
} }

8
Eigen/src/Core/PlainObjectBase.h
View File

@ -917,8 +917,8 @@ struct conservative_resize_like_impl
// The storage order does not allow us to use reallocation. // The storage order does not allow us to use reallocation.
typename Derived::PlainObject tmp(rows,cols); typename Derived::PlainObject tmp(rows,cols);
EIGEN_USING_STD_MATH(min) EIGEN_USING_STD_MATH(min)
const Index common_rows = min(rows, _this.rows()); const Index common_rows = (min)(rows, _this.rows());
const Index common_cols = min(cols, _this.cols()); const Index common_cols = (min)(cols, _this.cols());
tmp.block(0,0,common_rows,common_cols) = _this.block(0,0,common_rows,common_cols); tmp.block(0,0,common_rows,common_cols) = _this.block(0,0,common_rows,common_cols);
_this.derived().swap(tmp); _this.derived().swap(tmp);
} }
@ -952,8 +952,8 @@ struct conservative_resize_like_impl
// The storage order does not allow us to use reallocation. // The storage order does not allow us to use reallocation.
typename Derived::PlainObject tmp(other); typename Derived::PlainObject tmp(other);
EIGEN_USING_STD_MATH(min) EIGEN_USING_STD_MATH(min)
const Index common_rows = min(tmp.rows(), _this.rows()); const Index common_rows = (min)(tmp.rows(), _this.rows());
const Index common_cols = min(tmp.cols(), _this.cols()); const Index common_cols = (min)(tmp.cols(), _this.cols());
tmp.block(0,0,common_rows,common_cols) = _this.block(0,0,common_rows,common_cols); tmp.block(0,0,common_rows,common_cols) = _this.block(0,0,common_rows,common_cols);
_this.derived().swap(tmp); _this.derived().swap(tmp);
} }

6
Eigen/src/Core/TriangularMatrix.h
View File

@ -646,7 +646,7 @@ bool MatrixBase<Derived>::isUpperTriangular(const RealScalar& prec) const
EIGEN_USING_STD_MATH(min) EIGEN_USING_STD_MATH(min)
for(Index j = 0; j < cols(); ++j) for(Index j = 0; j < cols(); ++j)
{ {
Index maxi = min(j, rows()-1); Index maxi = (min)(j, rows()-1);
for(Index i = 0; i <= maxi; ++i) for(Index i = 0; i <= maxi; ++i)
{ {
RealScalar absValue = abs(coeff(i,j)); RealScalar absValue = abs(coeff(i,j));
@ -680,7 +680,7 @@ bool MatrixBase<Derived>::isLowerTriangular(const RealScalar& prec) const
RealScalar threshold = maxAbsOnLowerPart * prec; RealScalar threshold = maxAbsOnLowerPart * prec;
for(Index j = 1; j < cols(); ++j) for(Index j = 1; j < cols(); ++j)
{ {
Index maxi = min(j, rows()-1); Index maxi = (min)(j, rows()-1);
for(Index i = 0; i < maxi; ++i) for(Index i = 0; i < maxi; ++i)
if(abs(coeff(i, j)) > threshold) return false; if(abs(coeff(i, j)) > threshold) return false;
} }
@ -896,7 +896,7 @@ struct triangular_assignment_loop<Kernel, Mode, Dynamic, SetOpposite>
EIGEN_USING_STD_MATH(min) EIGEN_USING_STD_MATH(min)
for(Index j = 0; j < kernel.cols(); ++j) for(Index j = 0; j < kernel.cols(); ++j)
{ {
Index maxi = min(j, kernel.rows()); Index maxi = (min)(j, kernel.rows());
Index i = 0; Index i = 0;
if (((Mode&Lower) && SetOpposite) || (Mode&Upper)) if (((Mode&Lower) && SetOpposite) || (Mode&Upper))
{ {