From f3bacdce6d76f12183e9af3f0db937ba20098a92 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 6 Aug 2016 11:13:40 -0400 Subject: [PATCH] Fix some small test issues with std_cxx11::bind. --- tests/lac/block_vector_iterator.cc | 9 +++++---- tests/lac/complex_block_vector_iterator.cc | 9 +++++---- tests/petsc/block_vector_iterator_03.cc | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/lac/block_vector_iterator.cc b/tests/lac/block_vector_iterator.cc index b9ba9f10b9..1c4fc0a9e6 100644 --- a/tests/lac/block_vector_iterator.cc +++ b/tests/lac/block_vector_iterator.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2000 - 2015 by the deal.II authors +// Copyright (C) 2000 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -17,6 +17,7 @@ #include "../tests.h" #include +#include #include #include #include @@ -176,9 +177,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std::bind (std::multiplies(), - std::placeholders::_1, - 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/lac/complex_block_vector_iterator.cc b/tests/lac/complex_block_vector_iterator.cc index 9e9cd815d9..7ccaeb106d 100644 --- a/tests/lac/complex_block_vector_iterator.cc +++ b/tests/lac/complex_block_vector_iterator.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2000 - 2015 by the deal.II authors +// Copyright (C) 2000 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -17,6 +17,7 @@ #include "../tests.h" #include +#include #include #include #include @@ -176,9 +177,9 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), - std::bind (std::multiplies >(), - std_cxx11::_1, - 2.0)); + std_cxx11::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 377adacadb..de9f47438c 100644 --- a/tests/petsc/block_vector_iterator_03.cc +++ b/tests/petsc/block_vector_iterator_03.cc @@ -179,7 +179,7 @@ void test () // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), std_cxx11::bind (std::multiplies(), - std_cxx11::_1 + std_cxx11::_1, 2.0)); v2 *= 1./2.; deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; -- 2.39.5