From c9a429c8fbfb35b6f06fa8c3e610e2007ac7aa49 Mon Sep 17 00:00:00 2001 From: Jonathan Robey Date: Thu, 28 Jul 2016 12:22:16 -0700 Subject: [PATCH] Remove bind2nd in include --- include/deal.II/grid/filtered_iterator.h | 4 ++-- include/deal.II/lac/chunk_sparse_matrix.templates.h | 2 +- include/deal.II/numerics/time_dependent.h | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/deal.II/grid/filtered_iterator.h b/include/deal.II/grid/filtered_iterator.h index 183e85cd0a..f02521fe8b 100644 --- a/include/deal.II/grid/filtered_iterator.h +++ b/include/deal.II/grid/filtered_iterator.h @@ -376,11 +376,11 @@ namespace IteratorFilters * @endcode * then * @code - * std::bind2nd (std::ptr_fun(&level_equal_to), 3) + * std_cxx11::bind (std::ptr_fun(&level_equal_to), std_cxx11::_1, 3) * @endcode * is another valid predicate (here: a function that returns true if either * the iterator is past the end or the level is equal to the second argument; - * this second argument is bound to a fixed value using the @p std::bind2nd + * this second argument is bound to a fixed value using the @p std::bind * function). * * Finally, classes can be predicates. The following class is one: diff --git a/include/deal.II/lac/chunk_sparse_matrix.templates.h b/include/deal.II/lac/chunk_sparse_matrix.templates.h index b0f62143f1..76ed57c628 100644 --- a/include/deal.II/lac/chunk_sparse_matrix.templates.h +++ b/include/deal.II/lac/chunk_sparse_matrix.templates.h @@ -519,7 +519,7 @@ ChunkSparseMatrix::n_actually_nonzero_elements () const return std::count_if(&val[0], &val[cols->sparsity_pattern.n_nonzero_elements () * chunk_size * chunk_size], - std::bind2nd(std::not_equal_to(), 0)); + std_cxx11::bind(std::not_equal_to(), std_cxx11::_1, 0)); } diff --git a/include/deal.II/numerics/time_dependent.h b/include/deal.II/numerics/time_dependent.h index 79dae77629..504bdee3e0 100644 --- a/include/deal.II/numerics/time_dependent.h +++ b/include/deal.II/numerics/time_dependent.h @@ -283,9 +283,10 @@ template class Triangulation; * ... * * do_loop (mem_fun (&TimeStepBase_Tria::init_for_refinement), - * bind2nd (mem_fun1 (&TimeStepBase_Wave::refine_grid), - * TimeStepBase_Tria::RefinementData (top_threshold, - * bottom_threshold)), + * std_cxx11::bind (&TimeStepBase_Wave::refine_grid, + * std_cxx11::_1 + * TimeStepBase_Tria::RefinementData (top_threshold, + * bottom_threshold)), * TimeDependent::TimeSteppingData (0,1), * TimeDependent::forward); * @endcode @@ -524,7 +525,7 @@ public: * the TimeStepBase class. * * Instead of using the above form, you can equally well use - * bind2nd(mem_fun1(&X::unary_function), arg) which lets the @p + * std_cxx11::bind(&X::unary_function, std_cxx11::_1, arg) which lets the @p * do_loop function call the given function with the specified parameter. * Note that you need to bind the second parameter since the first one * implicitly contains the object which the function is to be called for. -- 2.39.5