From 82a47338df28b0ca1013ddad61ac4dee52e47ac7 Mon Sep 17 00:00:00 2001 From: Eugene Zhulenev Date: Wed, 27 Nov 2019 16:22:27 -0800 Subject: [PATCH] Fix shadow warnings in AlignedBox and SparseBlock --- Eigen/src/Core/util/Constants.h | 6 ------ Eigen/src/SparseCore/SparseBlock.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/Eigen/src/Core/util/Constants.h b/Eigen/src/Core/util/Constants.h index a5f63a9b5..7ada82195 100644 --- a/Eigen/src/Core/util/Constants.h +++ b/Eigen/src/Core/util/Constants.h @@ -254,12 +254,6 @@ enum AlignmentType { #endif }; -/** \ingroup enums - * Enum used by DenseBase::corner() in Eigen2 compatibility mode. */ -// FIXME after the corner() API change, this was not needed anymore, except by AlignedBox -// TODO: find out what to do with that. Adapt the AlignedBox API ? -enum CornerType { TopLeft, TopRight, BottomLeft, BottomRight }; - /** \ingroup enums * Enum containing possible values for the \p Direction parameter of * Reverse, PartialReduxExpr and VectorwiseOp. */ diff --git a/Eigen/src/SparseCore/SparseBlock.h b/Eigen/src/SparseCore/SparseBlock.h index d4535d866..40fb9dc07 100644 --- a/Eigen/src/SparseCore/SparseBlock.h +++ b/Eigen/src/SparseCore/SparseBlock.h @@ -463,7 +463,6 @@ template class unary_evaluator, IteratorBased>::InnerVectorInnerIterator : public EvalIterator { - enum { IsRowMajor = unary_evaluator::IsRowMajor }; const XprType& m_block; Index m_end; public: @@ -488,7 +487,6 @@ public: template class unary_evaluator, IteratorBased>::OuterVectorInnerIterator { - enum { IsRowMajor = unary_evaluator::IsRowMajor }; const unary_evaluator& m_eval; Index m_outerPos; const Index m_innerIndex;