diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2009-04-09 12:06:13 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2009-04-09 12:06:13 +0000 |
| commit | e6332cba4b2b9003924ca71db632aaf40bbe915f (patch) | |
| tree | d6375333fd70f9dc5e568d3fcf59a77ea26c12a3 /Eigen/src/Core | |
| parent | e8329f9f451f73193ed7c0da071114b381353924 (diff) | |
forward-port r951449: patch by Hauke Heibel: compile fix with VS 9
Diffstat (limited to 'Eigen/src/Core')
| -rw-r--r-- | Eigen/src/Core/Block.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Core/Block.h b/Eigen/src/Core/Block.h index 6d28ebc73..18ecc26a6 100644 --- a/Eigen/src/Core/Block.h +++ b/Eigen/src/Core/Block.h @@ -64,23 +64,23 @@ template<typename MatrixType, int BlockRows, int BlockCols, int _PacketAccess, int _DirectAccessStatus> struct ei_traits<Block<MatrixType, BlockRows, BlockCols, _PacketAccess, _DirectAccessStatus> > { - typedef typename MatrixType::Scalar Scalar; - typedef typename MatrixType::Nested MatrixTypeNested; + typedef typename ei_traits<MatrixType>::Scalar Scalar; + typedef typename ei_nested<MatrixType>::type MatrixTypeNested; typedef typename ei_unref<MatrixTypeNested>::type _MatrixTypeNested; enum{ RowsAtCompileTime = BlockRows, ColsAtCompileTime = BlockCols, MaxRowsAtCompileTime = RowsAtCompileTime == 1 ? 1 - : (BlockRows==Dynamic ? MatrixType::MaxRowsAtCompileTime : BlockRows), + : (BlockRows==Dynamic ? ei_traits<MatrixType>::MaxRowsAtCompileTime : BlockRows), MaxColsAtCompileTime = ColsAtCompileTime == 1 ? 1 - : (BlockCols==Dynamic ? MatrixType::MaxColsAtCompileTime : BlockCols), - RowMajor = int(MatrixType::Flags)&RowMajorBit, + : (BlockCols==Dynamic ? ei_traits<MatrixType>::MaxColsAtCompileTime : BlockCols), + RowMajor = int(ei_traits<MatrixType>::Flags)&RowMajorBit, InnerSize = RowMajor ? ColsAtCompileTime : RowsAtCompileTime, InnerMaxSize = RowMajor ? MaxColsAtCompileTime : MaxRowsAtCompileTime, MaskPacketAccessBit = (InnerMaxSize == Dynamic || (InnerSize >= ei_packet_traits<Scalar>::size)) ? PacketAccessBit : 0, FlagsLinearAccessBit = (RowsAtCompileTime == 1 || ColsAtCompileTime == 1) ? LinearAccessBit : 0, - Flags = (MatrixType::Flags & (HereditaryBits | MaskPacketAccessBit | DirectAccessBit)) | FlagsLinearAccessBit, + Flags = (ei_traits<MatrixType>::Flags & (HereditaryBits | MaskPacketAccessBit | DirectAccessBit)) | FlagsLinearAccessBit, CoeffReadCost = MatrixType::CoeffReadCost, PacketAccess = _PacketAccess }; |