diff options
Diffstat (limited to 'Eigen/src/Core/BandMatrix.h')
| -rw-r--r-- | Eigen/src/Core/BandMatrix.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Core/BandMatrix.h b/Eigen/src/Core/BandMatrix.h index e7139d015..2570d7b55 100644 --- a/Eigen/src/Core/BandMatrix.h +++ b/Eigen/src/Core/BandMatrix.h @@ -87,7 +87,7 @@ class BandMatrixBase : public EigenBase<Derived> if (i<=supers()) { start = supers()-i; - len = std::min(rows(),std::max<Index>(0,coeffs().rows() - (supers()-i))); + len = (std::min)(rows(),std::max<Index>(0,coeffs().rows() - (supers()-i))); } else if (i>=rows()-subs()) len = std::max<Index>(0,coeffs().rows() - (i + 1 - rows() + subs())); @@ -96,11 +96,11 @@ class BandMatrixBase : public EigenBase<Derived> /** \returns a vector expression of the main diagonal */ inline Block<CoefficientsType,1,SizeAtCompileTime> diagonal() - { return Block<CoefficientsType,1,SizeAtCompileTime>(coeffs(),supers(),0,1,std::min(rows(),cols())); } + { return Block<CoefficientsType,1,SizeAtCompileTime>(coeffs(),supers(),0,1,(std::min)(rows(),cols())); } /** \returns a vector expression of the main diagonal (const version) */ inline const Block<const CoefficientsType,1,SizeAtCompileTime> diagonal() const - { return Block<const CoefficientsType,1,SizeAtCompileTime>(coeffs(),supers(),0,1,std::min(rows(),cols())); } + { return Block<const CoefficientsType,1,SizeAtCompileTime>(coeffs(),supers(),0,1,(std::min)(rows(),cols())); } template<int Index> struct DiagonalIntReturnType { enum { @@ -122,13 +122,13 @@ class BandMatrixBase : public EigenBase<Derived> /** \returns a vector expression of the \a N -th sub or super diagonal */ template<int N> inline typename DiagonalIntReturnType<N>::Type diagonal() { - return typename DiagonalIntReturnType<N>::BuildType(coeffs(), supers()-N, std::max(0,N), 1, diagonalLength(N)); + return typename DiagonalIntReturnType<N>::BuildType(coeffs(), supers()-N, (std::max)(0,N), 1, diagonalLength(N)); } /** \returns a vector expression of the \a N -th sub or super diagonal */ template<int N> inline const typename DiagonalIntReturnType<N>::Type diagonal() const { - return typename DiagonalIntReturnType<N>::BuildType(coeffs(), supers()-N, std::max(0,N), 1, diagonalLength(N)); + return typename DiagonalIntReturnType<N>::BuildType(coeffs(), supers()-N, (std::max)(0,N), 1, diagonalLength(N)); } /** \returns a vector expression of the \a i -th sub or super diagonal */ @@ -166,7 +166,7 @@ class BandMatrixBase : public EigenBase<Derived> protected: inline Index diagonalLength(Index i) const - { return i<0 ? std::min(cols(),rows()+i) : std::min(rows(),cols()-i); } + { return i<0 ? (std::min)(cols(),rows()+i) : (std::min)(rows(),cols()-i); } }; /** |