From 473499f01cf67a6b0ac54e4ecc28e19801eed087 Mon Sep 17 00:00:00 2001 From: Jonathan Robey Date: Thu, 28 Jul 2016 12:36:34 -0700 Subject: [PATCH] Remove bind2nd in tests --- tests/grid/filtered_iterator.cc | 12 ++++++------ tests/grid/filtered_iterator_02.cc | 12 ++++++------ tests/lac/block_vector_iterator.cc | 5 +++-- tests/lac/complex_block_vector_iterator.cc | 5 +++-- tests/petsc/block_vector_iterator_03.cc | 5 +++-- tests/trilinos/block_vector_iterator_03.cc | 5 +++-- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/tests/grid/filtered_iterator.cc b/tests/grid/filtered_iterator.cc index 589a64977e..ccb9553c9b 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::bind2nd (std::ptr_fun(predicate), 3), + begin (std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), tria.begin_active (3)), - end (std::bind2nd (std::ptr_fun(predicate), 3), + end (std_cxx11::bind (std::ptr_fun(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::bind2nd (std::ptr_fun(predicate), 3)) + Assert (std::distance (FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std::bind2nd (std::ptr_fun(predicate), 3), tria.end())) == + FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)), ExcInternalError()); logfile << "Check 4: " - << (std::distance (FI(std::bind2nd (std::ptr_fun(predicate), 3)) + << (std::distance (FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std::bind2nd (std::ptr_fun(predicate), 3), tria.end())) == + FI(std_cxx11::bind (std::ptr_fun(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 1d3c44523e..e7c0499c3f 100644 --- a/tests/grid/filtered_iterator_02.cc +++ b/tests/grid/filtered_iterator_02.cc @@ -139,9 +139,9 @@ void test () bool (*predicate) (const active_cell_iterator, const unsigned int) = &level_equal_to; FilteredIterator - begin (std::bind2nd (std::ptr_fun(predicate), 3), + begin (std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), tria.begin_active (3)), - end (std::bind2nd (std::ptr_fun(predicate), 3), + end (std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), tria.end()); Assert (std::distance (begin, end) == @@ -163,15 +163,15 @@ void test () bool (*predicate) (const active_cell_iterator, const unsigned int) = &level_equal_to; - Assert (std::distance (FI(std::bind2nd (std::ptr_fun(predicate), 3)) + Assert (std::distance (FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std::bind2nd (std::ptr_fun(predicate), 3), tria.end())) == + FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)), ExcInternalError()); logfile << "Check 4: " - << (std::distance (FI(std::bind2nd (std::ptr_fun(predicate), 3)) + << (std::distance (FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3)) .set_to_next_positive(tria.begin_active()), - FI(std::bind2nd (std::ptr_fun(predicate), 3), tria.end())) == + FI(std_cxx11::bind (std::ptr_fun(predicate), std_cxx11::_1, 3), tria.end())) == static_cast(tria.n_active_cells (3)) ? "OK" : "Failed") diff --git a/tests/lac/block_vector_iterator.cc b/tests/lac/block_vector_iterator.cc index 19f12af085..b9ba9f10b9 100644 --- a/tests/lac/block_vector_iterator.cc +++ b/tests/lac/block_vector_iterator.cc @@ -176,8 +176,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std::bind2nd (std::multiplies(), - 2.0)); + std::bind (std::multiplies(), + std::placeholders::_1, + 2.0)); v2 *= 1./2; deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; diff --git a/tests/lac/complex_block_vector_iterator.cc b/tests/lac/complex_block_vector_iterator.cc index e1a46cb8f5..9e9cd815d9 100644 --- a/tests/lac/complex_block_vector_iterator.cc +++ b/tests/lac/complex_block_vector_iterator.cc @@ -176,8 +176,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std::bind2nd (std::multiplies >(), - 2.0)); + std::bind (std::multiplies >(), + std_cxx11::_1, + 2.0)); v2 *= std::complex(1./2.); deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; diff --git a/tests/petsc/block_vector_iterator_03.cc b/tests/petsc/block_vector_iterator_03.cc index 1263a74487..377adacadb 100644 --- a/tests/petsc/block_vector_iterator_03.cc +++ b/tests/petsc/block_vector_iterator_03.cc @@ -178,8 +178,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std::bind2nd (std::multiplies(), - 2.0)); + std_cxx11::bind (std::multiplies(), + std_cxx11::_1 + 2.0)); v2 *= 1./2.; deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; diff --git a/tests/trilinos/block_vector_iterator_03.cc b/tests/trilinos/block_vector_iterator_03.cc index dac72ba7b4..0d9d530aff 100644 --- a/tests/trilinos/block_vector_iterator_03.cc +++ b/tests/trilinos/block_vector_iterator_03.cc @@ -179,8 +179,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std::bind2nd (std::multiplies(), - 2.0)); + std::bind (std::multiplies(), + std_cxx11::_1, + 2.0)); v2 *= 1./2.; deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; -- 2.39.5