GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-15 13:15:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Workaround MSVC compilation issue.

Browse Source
This commit is contained in:
Gael Guennebaud 2016-10-01 20:16:48 +02:00
parent d7769cc3bd
commit 046850e1d0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Eigen/src/SparseCore/SparseBlock.h
View File

@ -524,12 +524,14 @@ 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 internal::remove_all<typename XprType::Nested>::type::InnerIterator class GenericSparseBlockInnerIteratorImpl<XprType,BlockRows,BlockCols,InnerPanel,false> : public internal::remove_all<typename XprType::Nested>::type::InnerIterator
{ {
public:
typedef Block<XprType, BlockRows, BlockCols, InnerPanel> BlockType; typedef Block<XprType, BlockRows, BlockCols, InnerPanel> BlockType;
enum { enum {
IsRowMajor = BlockType::IsRowMajor IsRowMajor = BlockType::IsRowMajor
}; };
typedef typename internal::remove_all<typename XprType::Nested>::type _MatrixTypeNested;
typedef typename BlockType::Index Index; typedef typename BlockType::Index Index;
protected:
typedef typename internal::remove_all<typename XprType::Nested>::type _MatrixTypeNested;
typedef typename _MatrixTypeNested::InnerIterator Base; typedef typename _MatrixTypeNested::InnerIterator Base;
const BlockType& m_block; const BlockType& m_block;
Index m_end; Index m_end;
@ -556,13 +558,15 @@ 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,true> class GenericSparseBlockInnerIteratorImpl<XprType,BlockRows,BlockCols,InnerPanel,true>
{ {
public:
typedef Block<XprType, BlockRows, BlockCols, InnerPanel> BlockType; typedef Block<XprType, BlockRows, BlockCols, InnerPanel> BlockType;
enum { enum {
IsRowMajor = BlockType::IsRowMajor IsRowMajor = BlockType::IsRowMajor
}; };
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;
protected:
typedef typename internal::remove_all<typename XprType::Nested>::type _MatrixTypeNested;
const BlockType& m_block; const BlockType& m_block;
Index m_outerPos; Index m_outerPos;
Index m_innerIndex; Index m_innerIndex;