diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2009-12-17 19:28:54 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2009-12-17 19:28:54 +0100 |
| commit | af4d8c5cecf1a1595dc601f2220ff3a8fd8d2957 (patch) | |
| tree | d654ac10f6820fe4920e1ae4974b697aa3c08037 /Eigen/src/Core/MatrixBase.h | |
| parent | 4b70b4799807a790607e07aa4adb1d4337abc547 (diff) | |
a couple of fixes, now Array passes the linearstructure test
Diffstat (limited to 'Eigen/src/Core/MatrixBase.h')
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 4c7113602..53dd6f991 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -124,14 +124,14 @@ template<typename Derived> class MatrixBase * reference to a matrix, not a matrix! It is however guaranteed that the return type of eval() is either * PlainMatrixType or const PlainMatrixType&. */ - typedef typename ei_plain_matrix_type<Derived>::type PlainMatrixType; -// typedef Matrix<typename ei_traits<Derived>::Scalar, -// ei_traits<Derived>::RowsAtCompileTime, -// ei_traits<Derived>::ColsAtCompileTime, -// AutoAlign | (ei_traits<Derived>::Flags&RowMajorBit ? RowMajor : ColMajor), -// ei_traits<Derived>::MaxRowsAtCompileTime, -// ei_traits<Derived>::MaxColsAtCompileTime -// > PlainMatrixType; +// typedef typename ei_plain_matrix_type<Derived>::type PlainMatrixType; + typedef Matrix<typename ei_traits<Derived>::Scalar, + ei_traits<Derived>::RowsAtCompileTime, + ei_traits<Derived>::ColsAtCompileTime, + AutoAlign | (ei_traits<Derived>::Flags&RowMajorBit ? RowMajor : ColMajor), + ei_traits<Derived>::MaxRowsAtCompileTime, + ei_traits<Derived>::MaxColsAtCompileTime + > PlainMatrixType; /** \internal the column-major plain matrix type corresponding to this expression. Note that is not necessarily * exactly the return type of eval(): in the case of plain matrices, the return type of eval() is a const * reference to a matrix, not a matrix! |