Skip to content
Snippets Groups Projects
Commit eeb34fbc authored by Jonathan Youett's avatar Jonathan Youett
Browse files

Fix overloaded virtual warnings

parent 40ab612a
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -16,6 +16,7 @@ template<class MatrixType, class VectorType> ...@@ -16,6 +16,7 @@ template<class MatrixType, class VectorType>
class MonotoneMGStep : public MultigridStep<MatrixType, VectorType> class MonotoneMGStep : public MultigridStep<MatrixType, VectorType>
{ {
using Base = MultigridStep<MatrixType,VectorType>;
static const int dim = VectorType::block_type::dimension; static const int dim = VectorType::block_type::dimension;
typedef typename VectorType::field_type field_type; typedef typename VectorType::field_type field_type;
...@@ -28,7 +29,7 @@ public: ...@@ -28,7 +29,7 @@ public:
MonotoneMGStep(const MatrixType& mat, MonotoneMGStep(const MatrixType& mat,
VectorType& x, VectorType& x,
VectorType& rhs) VectorType& rhs)
: MultigridStep<MatrixType, VectorType>(mat, x, rhs), : Base(mat, x, rhs),
hasObstacleHierarchy_(0), obstacleHierarchy_(0) hasObstacleHierarchy_(0), obstacleHierarchy_(0)
{ {
oldCritical.resize(x.size(), false); oldCritical.resize(x.size(), false);
...@@ -40,7 +41,7 @@ public: ...@@ -40,7 +41,7 @@ public:
VectorType& x, VectorType& x,
const VectorType& rhs) const VectorType& rhs)
{ {
MultigridStep<MatrixType, VectorType>::setProblem(mat,x,rhs); Base::setProblem(mat,x,rhs);
oldCritical.resize(x.size(), false); oldCritical.resize(x.size(), false);
} }
...@@ -74,6 +75,9 @@ protected: ...@@ -74,6 +75,9 @@ protected:
//! Hierarchy containing the obstacle values of the coarse obstacles //! Hierarchy containing the obstacle values of the coarse obstacles
std::vector<ObstacleVectorType*> obstacleHierarchy_; std::vector<ObstacleVectorType*> obstacleHierarchy_;
private:
using Base::setProblem;
}; };
#include "mmgstep.cc" #include "mmgstep.cc"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment