diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-06-14 09:05:08 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-06-14 09:05:08 -0400 |
| commit | d788627b54ab39af395639388e6723bb28784d20 (patch) | |
| tree | 688c20e8cde3040e4d1211bad0720a562469375f /Eigen/src/Core/util/XprHelper.h | |
| parent | a54772250f026393b16cb4f05f4e15528e935cae (diff) | |
rename:
EIGEN_SIZE_MIN ---> EIGEN_SIZE_MIN_PREFER_DYNAMIC
EIGEN_MAXSIZE_MIN ---> EIGEN_SIZE_MIN_PREFER_FIXED
and make sure to use the latter in products xprs to determine the inner size.
Diffstat (limited to 'Eigen/src/Core/util/XprHelper.h')
| -rw-r--r-- | Eigen/src/Core/util/XprHelper.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/XprHelper.h b/Eigen/src/Core/util/XprHelper.h index adb878665..54f15712c 100644 --- a/Eigen/src/Core/util/XprHelper.h +++ b/Eigen/src/Core/util/XprHelper.h @@ -429,8 +429,8 @@ struct ei_plain_col_type template<typename MatrixType, typename Scalar = typename MatrixType::Scalar> struct ei_plain_diag_type { - enum { diag_size = EIGEN_SIZE_MIN(MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime), - max_diag_size = EIGEN_MAXSIZE_MIN(MatrixType::MaxRowsAtCompileTime, MatrixType::MaxColsAtCompileTime) + enum { diag_size = EIGEN_SIZE_MIN_PREFER_DYNAMIC(MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime), + max_diag_size = EIGEN_SIZE_MIN_PREFER_FIXED(MatrixType::MaxRowsAtCompileTime, MatrixType::MaxColsAtCompileTime) }; typedef Matrix<Scalar, diag_size, 1, MatrixType::PlainObject::Options & ~RowMajor, max_diag_size, 1> type; }; |