From eeb34fbc50c83b4b0be2da782ba711c051b12ca2 Mon Sep 17 00:00:00 2001 From: Jonathan Youett <youett@math.fu-berlin.de> Date: Fri, 19 Feb 2016 16:57:12 +0100 Subject: [PATCH] Fix overloaded virtual warnings --- dune/solvers/iterationsteps/mmgstep.hh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dune/solvers/iterationsteps/mmgstep.hh b/dune/solvers/iterationsteps/mmgstep.hh index 0bc574de..b6bcd2be 100644 --- a/dune/solvers/iterationsteps/mmgstep.hh +++ b/dune/solvers/iterationsteps/mmgstep.hh @@ -16,6 +16,7 @@ template<class MatrixType, class VectorType> class MonotoneMGStep : public MultigridStep<MatrixType, VectorType> { + using Base = MultigridStep<MatrixType,VectorType>; static const int dim = VectorType::block_type::dimension; typedef typename VectorType::field_type field_type; @@ -28,7 +29,7 @@ public: MonotoneMGStep(const MatrixType& mat, VectorType& x, VectorType& rhs) - : MultigridStep<MatrixType, VectorType>(mat, x, rhs), + : Base(mat, x, rhs), hasObstacleHierarchy_(0), obstacleHierarchy_(0) { oldCritical.resize(x.size(), false); @@ -40,7 +41,7 @@ public: VectorType& x, const VectorType& rhs) { - MultigridStep<MatrixType, VectorType>::setProblem(mat,x,rhs); + Base::setProblem(mat,x,rhs); oldCritical.resize(x.size(), false); } @@ -74,6 +75,9 @@ protected: //! Hierarchy containing the obstacle values of the coarse obstacles std::vector<ObstacleVectorType*> obstacleHierarchy_; +private: + using Base::setProblem; + }; #include "mmgstep.cc" -- GitLab