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/Block.h | |
| parent | 4b70b4799807a790607e07aa4adb1d4337abc547 (diff) | |
a couple of fixes, now Array passes the linearstructure test
Diffstat (limited to 'Eigen/src/Core/Block.h')
| -rw-r--r-- | Eigen/src/Core/Block.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Eigen/src/Core/Block.h b/Eigen/src/Core/Block.h index 598d846ea..461652410 100644 --- a/Eigen/src/Core/Block.h +++ b/Eigen/src/Core/Block.h @@ -58,12 +58,11 @@ * \sa DenseBase::block(int,int,int,int), DenseBase::block(int,int), class VectorBlock */ template<typename MatrixType, int BlockRows, int BlockCols, int _DirectAccessStatus> -struct ei_traits<Block<MatrixType, BlockRows, BlockCols, _DirectAccessStatus> > +struct ei_traits<Block<MatrixType, BlockRows, BlockCols, _DirectAccessStatus> > : ei_traits<MatrixType> { typedef typename ei_traits<MatrixType>::Scalar Scalar; typedef typename ei_nested<MatrixType>::type MatrixTypeNested; typedef typename ei_unref<MatrixTypeNested>::type _MatrixTypeNested; - typedef typename ei_traits<MatrixType>::StorageType StorageType; enum{ RowsAtCompileTime = BlockRows, ColsAtCompileTime = BlockCols, @@ -77,8 +76,7 @@ struct ei_traits<Block<MatrixType, BlockRows, BlockCols, _DirectAccessStatus> > MaskPacketAccessBit = (InnerMaxSize == Dynamic || (InnerSize >= ei_packet_traits<Scalar>::size)) ? PacketAccessBit : 0, FlagsLinearAccessBit = (RowsAtCompileTime == 1 || ColsAtCompileTime == 1) ? LinearAccessBit : 0, - Flags = (ei_traits<MatrixType>::Flags & (HereditaryBits | MaskPacketAccessBit | DirectAccessBit)) | FlagsLinearAccessBit, - CoeffReadCost = ei_traits<MatrixType>::CoeffReadCost + Flags = (ei_traits<MatrixType>::Flags & (HereditaryBits | MaskPacketAccessBit | DirectAccessBit)) | FlagsLinearAccessBit }; }; |