bug #1300: compilation fix in Block<Sparse>

This commit is contained in:
Gael Guennebaud 2016-09-21 18:15:23 +02:00
parent fb81e4ab79
commit a60d71b840

View File

@ -522,13 +522,13 @@ public:
namespace internal { namespace internal {
template<typename XprType, int BlockRows, int BlockCols, bool InnerPanel> template<typename XprType, int BlockRows, int BlockCols, bool InnerPanel>
class GenericSparseBlockInnerIteratorImpl<XprType,BlockRows,BlockCols,InnerPanel,false> : public Block<XprType, BlockRows, BlockCols, InnerPanel>::_MatrixTypeNested::InnerIterator class GenericSparseBlockInnerIteratorImpl<XprType,BlockRows,BlockCols,InnerPanel,false> : public internal::remove_all<typename XprType::Nested>::type::InnerIterator
{ {
typedef Block<XprType, BlockRows, BlockCols, InnerPanel> BlockType; typedef Block<XprType, BlockRows, BlockCols, InnerPanel> BlockType;
enum { enum {
IsRowMajor = BlockType::IsRowMajor IsRowMajor = BlockType::IsRowMajor
}; };
typedef typename BlockType::_MatrixTypeNested _MatrixTypeNested; typedef typename internal::remove_all<typename XprType::Nested>::type _MatrixTypeNested;
typedef typename BlockType::Index Index; typedef typename BlockType::Index Index;
typedef typename _MatrixTypeNested::InnerIterator Base; typedef typename _MatrixTypeNested::InnerIterator Base;
const BlockType& m_block; const BlockType& m_block;
@ -560,7 +560,7 @@ namespace internal {
enum { enum {
IsRowMajor = BlockType::IsRowMajor IsRowMajor = BlockType::IsRowMajor
}; };
typedef typename BlockType::_MatrixTypeNested _MatrixTypeNested; typedef typename internal::remove_all<typename XprType::Nested>::type _MatrixTypeNested;
typedef typename BlockType::Index Index; typedef typename BlockType::Index Index;
typedef typename BlockType::Scalar Scalar; typedef typename BlockType::Scalar Scalar;
const BlockType& m_block; const BlockType& m_block;