From 4f770eacb16b86056e981f92915dbb5560dc11c9 Mon Sep 17 00:00:00 2001 From: Jonathan Robey Date: Sun, 31 Jul 2016 16:03:26 -0700 Subject: [PATCH] Eliminate ptr_fun from tests --- tests/grid/filtered_iterator.cc | 12 ++++++------ tests/grid/filtered_iterator_02.cc | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/grid/filtered_iterator.cc b/tests/grid/filtered_iterator.cc index ccb9553c9b..5e6111abeb 100644 --- a/tests/grid/filtered_iterator.cc +++ b/tests/grid/filtered_iterator.cc @@ -140,9 +140,9 @@ void test () bool (*predicate) (const active_cell_iterator, const unsigned int) = &level_equal_to; FilteredIterator - begin (std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), + begin (std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.begin_active (3)), - end (std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), + end (std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.end()); Assert (std::distance (begin, end) == @@ -164,15 +164,15 @@ void test () bool (*predicate) (const active_cell_iterator, const unsigned int) = &level_equal_to; - Assert (std::distance (FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3)) + Assert (std::distance (FI(std_cxx11::bind (predicate, std_cxx11::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), tria.end())) == + FI(std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)), ExcInternalError()); logfile << "Check 4: " - << (std::distance (FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3)) + << (std::distance (FI(std_cxx11::bind (predicate, std_cxx11::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), tria.end())) == + FI(std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)) ? "OK" : "Failed") diff --git a/tests/grid/filtered_iterator_02.cc b/tests/grid/filtered_iterator_02.cc index e7c0499c3f..571317cfe1 100644 --- a/tests/grid/filtered_iterator_02.cc +++ b/tests/grid/filtered_iterator_02.cc @@ -139,10 +139,10 @@ void test () bool (*predicate) (const active_cell_iterator, const unsigned int) = &level_equal_to; FilteredIterator - begin (std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), + begin (std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.begin_active (3)), - end (std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), - tria.end()); + end (std_cxx11::bind(predicate, std_cxx11::_1, 3), + tria.end()); Assert (std::distance (begin, end) == static_cast(tria.n_active_cells (3)), @@ -163,15 +163,15 @@ void test () bool (*predicate) (const active_cell_iterator, const unsigned int) = &level_equal_to; - Assert (std::distance (FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3)) + Assert (std::distance (FI(std_cxx11::bind (predicate, std_cxx11::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), tria.end())) == + FI(std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)), ExcInternalError()); logfile << "Check 4: " - << (std::distance (FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3)) + << (std::distance (FI(std_cxx11::bind (predicate, std_cxx11::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), tria.end())) == + FI(std_cxx11::bind (predicate, std_cxx11::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)) ? "OK" : "Failed") -- 2.39.5