diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-08-11 00:04:06 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-08-11 00:04:06 -0400 |
| commit | 97ced33b334caf6ec91c8b04c81c920fce777fd7 (patch) | |
| tree | 22f808bb0f5ada1d09eda8d6a7651eb11a084b6c /Eigen/src/Core/DenseBase.h | |
| parent | 40f6e26a247976ba1868520a4747e49e0739a42a (diff) | |
Backed out changeset 40f6e26a247976ba1868520a4747e49e0739a42a
See thread on mailing list: "InnerPanel change mis-detects alignment?"
Diffstat (limited to 'Eigen/src/Core/DenseBase.h')
| -rw-r--r-- | Eigen/src/Core/DenseBase.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index d4dfb0e49..c84544ec3 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -236,17 +236,17 @@ template<typename Derived> class DenseBase /** \internal the return type of MatrixBase::eigenvalues() */ typedef Matrix<typename NumTraits<typename ei_traits<Derived>::Scalar>::Real, ei_traits<Derived>::ColsAtCompileTime, 1> EigenvaluesReturnType; /** \internal expression type of a column */ - typedef Block<Derived, ei_traits<Derived>::RowsAtCompileTime, 1, !IsRowMajor> ColXpr; + typedef Block<Derived, ei_traits<Derived>::RowsAtCompileTime, 1> ColXpr; /** \internal expression type of a row */ - typedef Block<Derived, 1, ei_traits<Derived>::ColsAtCompileTime, IsRowMajor> RowXpr; + typedef Block<Derived, 1, ei_traits<Derived>::ColsAtCompileTime> RowXpr; /** \internal expression type of a block of whole columns */ - typedef Block<Derived, ei_traits<Derived>::RowsAtCompileTime, Dynamic, !IsRowMajor> ColsBlockXpr; + typedef Block<Derived, ei_traits<Derived>::RowsAtCompileTime, Dynamic> ColsBlockXpr; /** \internal expression type of a block of whole rows */ - typedef Block<Derived, Dynamic, ei_traits<Derived>::ColsAtCompileTime, IsRowMajor> RowsBlockXpr; + typedef Block<Derived, Dynamic, ei_traits<Derived>::ColsAtCompileTime> RowsBlockXpr; /** \internal expression type of a block of whole columns */ - template<int N> struct NColsBlockXpr { typedef Block<Derived, ei_traits<Derived>::RowsAtCompileTime, N, !IsRowMajor> Type; }; + template<int N> struct NColsBlockXpr { typedef Block<Derived, ei_traits<Derived>::RowsAtCompileTime, N> Type; }; /** \internal expression type of a block of whole rows */ - template<int N> struct NRowsBlockXpr { typedef Block<Derived, N, ei_traits<Derived>::ColsAtCompileTime, IsRowMajor> Type; }; + template<int N> struct NRowsBlockXpr { typedef Block<Derived, N, ei_traits<Derived>::ColsAtCompileTime> Type; }; #endif // not EIGEN_PARSED_BY_DOXYGEN |