diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-01-27 11:42:04 -0500 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-01-27 11:42:04 -0500 |
commit | 828d058b4b340a467da7f7bea6bb29522a6565f9 (patch) | |
tree | d1ba7df441ddc1f7365bbfad637fa0616abc8710 /Eigen/src/Core/BandMatrix.h | |
parent | dcbf104bccec39e955ab84c76bf1d96beaa31aa1 (diff) |
EIGEN_ENUM_MIN ---> EIGEN_SIZE_MIN
Diffstat (limited to 'Eigen/src/Core/BandMatrix.h')
-rw-r--r-- | Eigen/src/Core/BandMatrix.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Eigen/src/Core/BandMatrix.h b/Eigen/src/Core/BandMatrix.h index 67684eca3..538e6dd76 100644 --- a/Eigen/src/Core/BandMatrix.h +++ b/Eigen/src/Core/BandMatrix.h @@ -77,7 +77,7 @@ class BandMatrix : public AnyMatrixBase<BandMatrix<_Scalar,Rows,Cols,Supers,Subs DataRowsAtCompileTime = ((Supers!=Dynamic) && (Subs!=Dynamic)) ? 1 + Supers + Subs : Dynamic, - SizeAtCompileTime = EIGEN_ENUM_MIN(Rows,Cols) + SizeAtCompileTime = EIGEN_SIZE_MIN(Rows,Cols) }; typedef Matrix<Scalar,DataRowsAtCompileTime,ColsAtCompileTime,Options&RowMajor?RowMajor:ColMajor> DataType; @@ -136,6 +136,7 @@ class BandMatrix : public AnyMatrixBase<BandMatrix<_Scalar,Rows,Cols,Supers,Subs DiagonalSize = (RowsAtCompileTime==Dynamic || ColsAtCompileTime==Dynamic) ? Dynamic : (ActualIndex<0 + // we handled Dynamic already, so can use EIGEN_ENUM_MIN safely here. ? EIGEN_ENUM_MIN(ColsAtCompileTime, RowsAtCompileTime + ActualIndex) : EIGEN_ENUM_MIN(RowsAtCompileTime, ColsAtCompileTime - ActualIndex)) }; |