From 0dcbe16ad155d4633652a4680e356f01e1ca3e78 Mon Sep 17 00:00:00 2001 From: Jonathan Robey Date: Sun, 31 Jul 2016 15:40:50 -0700 Subject: [PATCH] Eliminate mem_fun in include Replace with std_cxx11::bind --- include/deal.II/numerics/time_dependent.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/deal.II/numerics/time_dependent.h b/include/deal.II/numerics/time_dependent.h index ff5adfcdb2..b7e1fe8175 100644 --- a/include/deal.II/numerics/time_dependent.h +++ b/include/deal.II/numerics/time_dependent.h @@ -251,8 +251,8 @@ template class Triangulation; * void * TimeDependent::solve_primal_problem () * { - * do_loop (mem_fun(&TimeStepBase::init_for_primal_problem), - * mem_fun(&TimeStepBase::solve_primal_problem), + * do_loop (std_cxx11::bind(&TimeStepBase::init_for_primal_problem, std_cxx11::_1), + * std_cxx11::bind(&TimeStepBase::solve_primal_problem, std_cxx11::_1), * timestepping_data_primal, * forward); * }; @@ -273,7 +273,7 @@ template class Triangulation; * look-back and the last one denotes in which direction the loop is to be * run. * - * Using function pointers through the @p mem_fun functions provided by the + * Using function pointers through the @p std_cxx11::bind functions provided by the * C++ standard library, it is possible to do neat tricks, like the * following, also taken from the wave program, in this case from the function * @p refine_grids: @@ -282,11 +282,11 @@ template class Triangulation; * compute the thresholds for refinement * ... * - * do_loop (mem_fun (&TimeStepBase_Tria::init_for_refinement), - * std_cxx11::bind (&TimeStepBase_Wave::refine_grid, - * std_cxx11::_1, - * TimeStepBase_Tria::RefinementData (top_threshold, - * bottom_threshold)), + * do_loop (std_cxx11::bind(&TimeStepBase_Tria::init_for_refinement, std_cxx11::_1), + * std_cxx11::bind(&TimeStepBase_Wave::refine_grid, + * std_cxx11::_1, + * TimeStepBase_Tria::RefinementData (top_threshold, + * bottom_threshold)), * TimeDependent::TimeSteppingData (0,1), * TimeDependent::forward); * @endcode @@ -512,8 +512,8 @@ public: * * To see how this function work, note that the function @p * solve_primal_problem only consists of a call to do_loop - * (mem_fun(&TimeStepBase::init_for_primal_problem), - * mem_fun(&TimeStepBase::solve_primal_problem), timestepping_data_primal, + * (std_cxx11::bind(&TimeStepBase::init_for_primal_problem, std_cxx11::_1), + * std_cxx11::bind(&TimeStepBase::solve_primal_problem, std_cxx11::_1), timestepping_data_primal, * forward);. * * Note also, that the given class from which the two functions are taken -- 2.39.5