From: Sebastian Proell Date: Fri, 11 Aug 2023 09:04:20 +0000 (+0200) Subject: Don't use implementation-reserved double underscores X-Git-Tag: relicensing~598^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15870%2Fhead;p=dealii.git Don't use implementation-reserved double underscores --- diff --git a/include/deal.II/trilinos/nox.templates.h b/include/deal.II/trilinos/nox.templates.h index 9004c5ced4..98df8ffb7e 100644 --- a/include/deal.II/trilinos/nox.templates.h +++ b/include/deal.II/trilinos/nox.templates.h @@ -836,17 +836,17 @@ namespace TrilinosWrappers else { // unwrap the various vectors - const VectorType &x__ = *dynamic_cast< + const VectorType &x = *dynamic_cast< const internal::NOXWrappers::Vector *>( &problem.getSolutionGroup().getX()); - const VectorType &f__ = *dynamic_cast< + const VectorType &f = *dynamic_cast< const internal::NOXWrappers::Vector *>( &problem.getSolutionGroup().getF()); - // forward to the user-provided function and checks + // forward to the user-provided function and check // convergence const auto state = this->check_iteration_status( - problem.getNumIterations(), f__.l2_norm(), x__, f__); + problem.getNumIterations(), f.l2_norm(), x, f); // translate the returned value back to Trilinos data // structure