Commit 1acd4eb4 authored by Martin Nolte's avatar Martin Nolte

Merge branch 'cherry-pick-406ca2a9' into 'releases/2.6'

Merge branch 'bugfix/fix-shadowed-method-in-iterativesolver' into 'master'

See merge request !187
parents 01b2492b ff8fba1a
Pipeline #7490 passed with stage
in 16 minutes and 12 seconds
......@@ -271,6 +271,12 @@ namespace Dune
// apply(x,b,_reduction,res);
// }
#ifndef DOXYGEN
// make sure the three-argument apply from the base class does not get shadowed
// by the redefined four-argument version below
using InverseOperator<X,Y>::apply;
#endif
/*!
\brief Apply inverse operator with given reduction factor.
......@@ -280,7 +286,7 @@ namespace Dune
{
scalar_real_type saved_reduction = _reduction;
_reduction = reduction;
static_cast<InverseOperator<X,Y>*>(this)->apply(x,b,res);
this->apply(x,b,res);
_reduction = saved_reduction;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment