From 7b9ae89b19a08ed90d550bf846f3c04d4e071594 Mon Sep 17 00:00:00 2001 From: David Wells Date: Mon, 22 May 2017 14:47:08 -0400 Subject: [PATCH] Remove references to the old read_input function. --- include/deal.II/base/parameter_handler.h | 11 +++++------ .../parameter_handler_exceptions_01.cc | 2 +- .../parameter_handler_exceptions_02.cc | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/deal.II/base/parameter_handler.h b/include/deal.II/base/parameter_handler.h index 1b5867af30..197277e9f4 100644 --- a/include/deal.II/base/parameter_handler.h +++ b/include/deal.II/base/parameter_handler.h @@ -2586,15 +2586,14 @@ public: * will stop parsing lines after encountering @p last_line . * This is handy when adding extra data that shall be parsed manually. * - * @note Of the three parse_input functions implemented by - * ParameterHandler, this method and the deprecated method - * MultipleParameterLoop::read_input are the only ones overridden with new - * behavior by this class. This is because the other two parse_input - * functions just reformat their inputs and then call this version. + * @note This is the only overload of the three parse_input + * functions implemented by ParameterHandler overridden with new behavior by + * this class. This is because the other two parse_input functions + * just reformat their inputs and then call this version. */ virtual void parse_input (std::istream &input, const std::string &filename = "input file", - const std::string &last_line = ""); + const std::string &last_line = "") override; /** * Overriding virtual functions which are overloaded (like diff --git a/tests/parameter_handler/parameter_handler_exceptions_01.cc b/tests/parameter_handler/parameter_handler_exceptions_01.cc index ec68a0e6a4..14ec9299c9 100644 --- a/tests/parameter_handler/parameter_handler_exceptions_01.cc +++ b/tests/parameter_handler/parameter_handler_exceptions_01.cc @@ -54,7 +54,7 @@ void check (const char *p) // make sure the prm object was reset to a state where we are in the - // subsection we were in before attempting the `read_input` call + // subsection we were in before attempting the `parse_input` call // (namely, in the top-level section of the prm tree) deallog << "test_1=" << prm.get ("test_1") // should =1, because we read that value diff --git a/tests/parameter_handler/parameter_handler_exceptions_02.cc b/tests/parameter_handler/parameter_handler_exceptions_02.cc index 7d7c7a40b0..120fc3239b 100644 --- a/tests/parameter_handler/parameter_handler_exceptions_02.cc +++ b/tests/parameter_handler/parameter_handler_exceptions_02.cc @@ -63,7 +63,7 @@ void check (const char *p) // make sure the prm object was reset to a state where we are in the - // subsection we were in before attempting the `read_input` call + // subsection we were in before attempting the `parse_input` call // (namely, in the top-level section of the prm tree) deallog << "test_1=" << prm.get ("test_1") // should =1, because we read that value -- 2.39.5