From f7ddd033e14c0219b6c3a847a8fb227945ec63e2 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Sun, 2 Oct 2016 18:29:02 +0200 Subject: [PATCH] Workaround compilation issue with visual --- Eigen/src/SparseCore/SparseBlock.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Eigen/src/SparseCore/SparseBlock.h b/Eigen/src/SparseCore/SparseBlock.h index 9a66a94fb..7971d1e9c 100644 --- a/Eigen/src/SparseCore/SparseBlock.h +++ b/Eigen/src/SparseCore/SparseBlock.h @@ -16,11 +16,11 @@ template class BlockImpl : public SparseMatrixBase > { - typedef typename internal::remove_all::type _MatrixTypeNested; - typedef Block BlockType; public: + typedef Block BlockType; enum { IsRowMajor = internal::traits::IsRowMajor }; protected: + typedef typename internal::remove_all::type _MatrixTypeNested; enum { OuterSize = IsRowMajor ? BlockRows : BlockCols }; public: EIGEN_SPARSE_PUBLIC_INTERFACE(BlockType) @@ -93,9 +93,9 @@ class BlockImpl,BlockRows,BlockCols,true { typedef SparseMatrix<_Scalar, _Options, _Index> SparseMatrixType; typedef typename internal::remove_all::type _MatrixTypeNested; - typedef Block BlockType; typedef Block ConstBlockType; public: + typedef Block BlockType; enum { IsRowMajor = internal::traits::IsRowMajor }; EIGEN_SPARSE_PUBLIC_INTERFACE(BlockType) protected: @@ -280,8 +280,8 @@ class BlockImpl,BlockRows,BlockCol { typedef SparseMatrix<_Scalar, _Options, _Index> SparseMatrixType; typedef typename internal::remove_all::type _MatrixTypeNested; - typedef Block BlockType; public: + typedef Block BlockType; enum { IsRowMajor = internal::traits::IsRowMajor }; EIGEN_SPARSE_PUBLIC_INTERFACE(BlockType) protected: @@ -428,9 +428,9 @@ template class BlockImpl : public SparseMatrixBase >, internal::no_assignment_operator { - typedef typename internal::remove_all::type _MatrixTypeNested; - typedef Block BlockType; -public: + typedef typename internal::remove_all::type _MatrixTypeNested; + public: + typedef Block BlockType; enum { IsRowMajor = internal::traits::IsRowMajor }; EIGEN_SPARSE_PUBLIC_INTERFACE(BlockType)