From 36ae576f96bd7779f631e0adb406a142f1de129f Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 31 Dec 2014 12:40:13 -0600 Subject: [PATCH] Remove deprecated function ThetaTimestepping::operator(). --- doc/news/changes.h | 1 + include/deal.II/algorithms/theta_timestepping.h | 5 ----- include/deal.II/algorithms/theta_timestepping.templates.h | 8 -------- tests/algorithms/theta_01_compat.cc | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 97a953ee5f..fe2bc47379 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -59,6 +59,7 @@ inconvenience this causes. - The version of GridGenerator::parallelogram where the corners are given as a rank-2 tensor rather than as an array of points. - DataOutBase::create_xdmf_entry with 3 arguments. + - ThetaTimestepping::operator().
  • Removed: The config.h file no longer exports HAVE_* definitions. diff --git a/include/deal.II/algorithms/theta_timestepping.h b/include/deal.II/algorithms/theta_timestepping.h index e24c3a0194..04a930c9ea 100644 --- a/include/deal.II/algorithms/theta_timestepping.h +++ b/include/deal.II/algorithms/theta_timestepping.h @@ -211,11 +211,6 @@ namespace Algorithms */ virtual void operator() (AnyData &out, const AnyData &in); - /** - * @deprecated Use the function with AnyData arguments - */ - virtual void operator() (NamedData &out, const NamedData &in); - /** * Register an event triggered by an outer iteration. */ diff --git a/include/deal.II/algorithms/theta_timestepping.templates.h b/include/deal.II/algorithms/theta_timestepping.templates.h index 1ab1ec6aae..f53557bfa7 100644 --- a/include/deal.II/algorithms/theta_timestepping.templates.h +++ b/include/deal.II/algorithms/theta_timestepping.templates.h @@ -68,14 +68,6 @@ namespace Algorithms } - template - void - ThetaTimestepping::operator() (NamedData &out, const NamedData &in) - { - Operator::operator() (out, in); - } - - template void ThetaTimestepping::operator() (AnyData &out, const AnyData &in) diff --git a/tests/algorithms/theta_01_compat.cc b/tests/algorithms/theta_01_compat.cc index 734ea5062b..09f72a844f 100644 --- a/tests/algorithms/theta_01_compat.cc +++ b/tests/algorithms/theta_01_compat.cc @@ -95,7 +95,7 @@ int main() outdata.add(p, "value"); deallog << "Initial: " << value(0) << ' ' << value(1) << std::endl; solver.notify(Events::initial); - solver(outdata, indata); + solver.Operator >::operator()(outdata, indata); deallog << "Result: " << value(0) << ' ' << value(1) << " Norm " << value.l2_norm() << std::endl; } -- 2.39.5