Fix deprecated usage of boost/bind.hpp.

boost/bind.hpp emits compiler warnings about deprecation of the header
and global _N placeholders. This commit converts usage of this header
to boost/bind/bind.hpp and using namespace boost::placeholders.

Where boost::bind is not actually used, the includes are removed.
This commit is contained in:
Andrey Semashev
2020-05-11 19:26:26 +03:00
parent 3b04f1a65e
commit ee1ec1cf57
39 changed files with 18 additions and 40 deletions

View File

@ -19,7 +19,7 @@
#include <boost/range/adaptor/transformed.hpp> #include <boost/range/adaptor/transformed.hpp>
#include <boost/range/adaptor/filtered.hpp> #include <boost/range/adaptor/filtered.hpp>
#include <boost/range/algorithm/copy.hpp> #include <boost/range/algorithm/copy.hpp>
#include <boost/bind.hpp> #include <boost/bind/bind.hpp>
#include <boost/test/test_tools.hpp> #include <boost/test/test_tools.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
@ -88,6 +88,8 @@ void chained_adaptors_test()
std::set<foo> foos; std::set<foo> foos;
using namespace boost::placeholders;
boost::copy(sep boost::copy(sep
| boost::adaptors::transformed(boost::bind(&foo::from_string, _1)) | boost::adaptors::transformed(boost::bind(&foo::from_string, _1))
| boost::adaptors::filtered(boost::bind(&foo::is_valid, _1)), | boost::adaptors::filtered(boost::bind(&foo::is_valid, _1)),

View File

@ -14,7 +14,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp> #include <boost/bind/bind.hpp>
#include <boost/range/algorithm_ext.hpp> #include <boost/range/algorithm_ext.hpp>
#include <algorithm> #include <algorithm>
@ -140,6 +140,7 @@ namespace boost
void transformed_bind() void transformed_bind()
{ {
using namespace boost::adaptors; using namespace boost::adaptors;
using namespace boost::placeholders;
std::vector<foo_bind> input(5); std::vector<foo_bind> input(5);
std::vector<int> output; std::vector<int> output;

View File

@ -37,7 +37,6 @@
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/array.hpp> #include <boost/array.hpp>
#include <boost/bind.hpp>
#include <boost/range/numeric.hpp> #include <boost/range/numeric.hpp>
#include <boost/range/algorithm.hpp> #include <boost/range/algorithm.hpp>
#include <boost/range/value_type.hpp> #include <boost/range/value_type.hpp>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -14,7 +14,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -11,7 +11,6 @@
#include <boost/test/test_tools.hpp> #include <boost/test/test_tools.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <boost/range/algorithm/lower_bound.hpp> #include <boost/range/algorithm/lower_bound.hpp>
#include "../test_driver/range_return_test_driver.hpp" #include "../test_driver/range_return_test_driver.hpp"
#include <algorithm> #include <algorithm>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <boost/range/iterator.hpp> #include <boost/range/iterator.hpp>
#include "../test_driver/range_return_test_driver.hpp" #include "../test_driver/range_return_test_driver.hpp"
#include <algorithm> #include <algorithm>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <boost/range/iterator.hpp> #include <boost/range/iterator.hpp>
#include "../test_driver/range_return_test_driver.hpp" #include "../test_driver/range_return_test_driver.hpp"
#include <algorithm> #include <algorithm>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -14,7 +14,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include "../test_driver/range_return_test_driver.hpp" #include "../test_driver/range_return_test_driver.hpp"
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include "../test_function/counted_function.hpp" #include "../test_function/counted_function.hpp"
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>

View File

@ -14,7 +14,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -14,7 +14,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -14,7 +14,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp> #include <boost/bind/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>
@ -64,6 +64,8 @@ namespace
template< class Container > template< class Container >
void test_remove_copy_if_( const Container& c, int to_remove ) void test_remove_copy_if_( const Container& c, int to_remove )
{ {
using namespace boost::placeholders;
test_remove_copy_if_impl(c, boost::bind(std::equal_to<int>(), _1, to_remove)); test_remove_copy_if_impl(c, boost::bind(std::equal_to<int>(), _1, to_remove));
test_remove_copy_if_impl(c, boost::bind(std::not_equal_to<int>(), _1, to_remove)); test_remove_copy_if_impl(c, boost::bind(std::not_equal_to<int>(), _1, to_remove));
} }

View File

@ -14,7 +14,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp> #include <boost/bind/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>
@ -59,6 +59,8 @@ namespace boost
template< class Container > template< class Container >
void test_remove_if_( const Container& c, int to_remove ) void test_remove_if_( const Container& c, int to_remove )
{ {
using namespace boost::placeholders;
test_remove_if_impl(c, boost::bind(std::equal_to<int>(), _1, to_remove)); test_remove_if_impl(c, boost::bind(std::equal_to<int>(), _1, to_remove));
test_remove_if_impl(c, boost::bind(std::not_equal_to<int>(), _1, to_remove)); test_remove_if_impl(c, boost::bind(std::not_equal_to<int>(), _1, to_remove));
} }

View File

@ -14,7 +14,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -14,7 +14,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp> #include <boost/bind/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>
@ -66,6 +66,8 @@ namespace
template< class Container > template< class Container >
void test_replace_copy_if_( const Container& c, int to_replace ) void test_replace_copy_if_( const Container& c, int to_replace )
{ {
using namespace boost::placeholders;
test_replace_copy_if_impl(c, boost::bind(std::equal_to<int>(), _1, to_replace)); test_replace_copy_if_impl(c, boost::bind(std::equal_to<int>(), _1, to_replace));
test_replace_copy_if_impl(c, boost::bind(std::not_equal_to<int>(), _1, to_replace)); test_replace_copy_if_impl(c, boost::bind(std::not_equal_to<int>(), _1, to_replace));
} }

View File

@ -14,7 +14,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp> #include <boost/bind/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>
@ -29,6 +29,8 @@ namespace boost
template< class Container, class UnaryPredicate > template< class Container, class UnaryPredicate >
void test_replace_if_impl(Container& cont, UnaryPredicate pred) void test_replace_if_impl(Container& cont, UnaryPredicate pred)
{ {
using namespace boost::placeholders;
const int what = 2; const int what = 2;
const int with_what = 5; const int with_what = 5;

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include "../test_driver/range_return_test_driver.hpp" #include "../test_driver/range_return_test_driver.hpp"
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -14,7 +14,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -15,7 +15,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#include "../test_driver/range_overload_test_driver.hpp" #include "../test_driver/range_overload_test_driver.hpp"
#include <algorithm> #include <algorithm>

View File

@ -14,7 +14,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <list> #include <list>

View File

@ -12,7 +12,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <boost/bind.hpp>
#include "../test_driver/range_return_test_driver.hpp" #include "../test_driver/range_return_test_driver.hpp"
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>