diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2011-07-21 11:19:36 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2011-07-21 11:19:36 +0200 |
| commit | 22bff949c898e7c340a415d771145c0bd22317d6 (patch) | |
| tree | be0fc956a220db15d4d7622fc580777f563ea643 /Eigen/src/Core/TriangularMatrix.h | |
| parent | d4bd8bddb5e9f968ffcbdfff5936934e3d706684 (diff) | |
protect calls to min and max with parentheses to make Eigen compatible with default windows.h
(transplanted from 49b6e9143e1d74441924c0c313536e263e12a55c
)
Diffstat (limited to 'Eigen/src/Core/TriangularMatrix.h')
| -rw-r--r-- | Eigen/src/Core/TriangularMatrix.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Eigen/src/Core/TriangularMatrix.h b/Eigen/src/Core/TriangularMatrix.h index d3e195e8a..033e81036 100644 --- a/Eigen/src/Core/TriangularMatrix.h +++ b/Eigen/src/Core/TriangularMatrix.h @@ -492,7 +492,7 @@ struct triangular_assignment_selector<Derived1, Derived2, Upper, Dynamic, ClearO { for(Index j = 0; j < dst.cols(); ++j) { - Index maxi = std::min(j, dst.rows()-1); + Index maxi = (std::min)(j, dst.rows()-1); for(Index i = 0; i <= maxi; ++i) dst.copyCoeff(i, j, src); if (ClearOpposite) @@ -512,7 +512,7 @@ struct triangular_assignment_selector<Derived1, Derived2, Lower, Dynamic, ClearO { for(Index i = j; i < dst.rows(); ++i) dst.copyCoeff(i, j, src); - Index maxi = std::min(j, dst.rows()); + Index maxi = (std::min)(j, dst.rows()); if (ClearOpposite) for(Index i = 0; i < maxi; ++i) dst.coeffRef(i, j) = static_cast<typename Derived1::Scalar>(0); @@ -528,7 +528,7 @@ struct triangular_assignment_selector<Derived1, Derived2, StrictlyUpper, Dynamic { for(Index j = 0; j < dst.cols(); ++j) { - Index maxi = std::min(j, dst.rows()); + Index maxi = (std::min)(j, dst.rows()); for(Index i = 0; i < maxi; ++i) dst.copyCoeff(i, j, src); if (ClearOpposite) @@ -548,7 +548,7 @@ struct triangular_assignment_selector<Derived1, Derived2, StrictlyLower, Dynamic { for(Index i = j+1; i < dst.rows(); ++i) dst.copyCoeff(i, j, src); - Index maxi = std::min(j, dst.rows()-1); + Index maxi = (std::min)(j, dst.rows()-1); if (ClearOpposite) for(Index i = 0; i <= maxi; ++i) dst.coeffRef(i, j) = static_cast<typename Derived1::Scalar>(0); @@ -564,7 +564,7 @@ struct triangular_assignment_selector<Derived1, Derived2, UnitUpper, Dynamic, Cl { for(Index j = 0; j < dst.cols(); ++j) { - Index maxi = std::min(j, dst.rows()); + Index maxi = (std::min)(j, dst.rows()); for(Index i = 0; i < maxi; ++i) dst.copyCoeff(i, j, src); if (ClearOpposite) @@ -584,7 +584,7 @@ struct triangular_assignment_selector<Derived1, Derived2, UnitLower, Dynamic, Cl { for(Index j = 0; j < dst.cols(); ++j) { - Index maxi = std::min(j, dst.rows()); + Index maxi = (std::min)(j, dst.rows()); for(Index i = maxi+1; i < dst.rows(); ++i) dst.copyCoeff(i, j, src); if (ClearOpposite) @@ -796,7 +796,7 @@ bool MatrixBase<Derived>::isUpperTriangular(RealScalar prec) const RealScalar maxAbsOnUpperPart = static_cast<RealScalar>(-1); for(Index j = 0; j < cols(); ++j) { - Index maxi = std::min(j, rows()-1); + Index maxi = (std::min)(j, rows()-1); for(Index i = 0; i <= maxi; ++i) { RealScalar absValue = internal::abs(coeff(i,j)); @@ -828,7 +828,7 @@ bool MatrixBase<Derived>::isLowerTriangular(RealScalar prec) const RealScalar threshold = maxAbsOnLowerPart * prec; for(Index j = 1; j < cols(); ++j) { - Index maxi = std::min(j, rows()-1); + Index maxi = (std::min)(j, rows()-1); for(Index i = 0; i < maxi; ++i) if(internal::abs(coeff(i, j)) > threshold) return false; } |