feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

Merge pull request #105 from Lastique/fix_deprecated_headers

Browse Source 
Fix usage of deprecated headers
This commit is contained in:
Glen Fernandes
2020-05-11 12:59:37 -04:00
committed by GitHub
parent 994ff83292 ee1ec1cf57
commit 4ed7887128
41 changed files with 34 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/boost/range/detail/collection_traits_detail.hpp
View File

@ -12,6 +12,8 @@
#include <cstddef>
#include <string>
#include <utility>
#include <iterator>
#include <boost/type_traits/is_array.hpp>
#include <boost/type_traits/is_pointer.hpp>
#include <boost/type_traits/is_const.hpp>
@ -22,7 +24,6 @@
#include <boost/mpl/identity.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/mpl/fold.hpp>
#include <boost/detail/iterator.hpp>
// Container traits implementation ---------------------------------------------------------
@ -36,7 +37,7 @@ namespace boost {
/*
Wraps std::container compliant containers
*/
template< typename ContainerT >
template< typename ContainerT >
struct default_container_traits
{
typedef typename ContainerT::value_type value_type;
@ -49,7 +50,7 @@ namespace boost {
>::type result_iterator;
typedef typename ContainerT::difference_type difference_type;
typedef typename ContainerT::size_type size_type;
// static operations
template< typename C >
static size_type size( const C& c )
@ -120,11 +121,11 @@ namespace boost {
{
typedef typename PairT::first_type element_type;
typedef typename ::boost::detail::
iterator_traits<element_type>::value_type value_type;
typedef typename
std::iterator_traits<element_type>::value_type value_type;
typedef std::size_t size_type;
typedef typename ::boost::detail::
iterator_traits<element_type>::difference_type difference_type;
typedef typename
std::iterator_traits<element_type>::difference_type difference_type;
typedef element_type iterator;
typedef element_type const_iterator;
@ -186,7 +187,7 @@ namespace boost {
BOOST_STATIC_CONSTANT( size_type, array_size = sz );
};
// array length resolving
/*
Lenght of string contained in a static array could
@ -243,7 +244,7 @@ namespace boost {
else
return std::char_traits<char>::length(a);
}
template< typename A >
static bool empty( const A& a )
{
@ -303,7 +304,7 @@ namespace boost {
const_iterator,
iterator
>::type result_iterator;
private:
// resolve array size
typedef typename
@ -327,7 +328,7 @@ namespace boost {
{
return array_length_type::empty(a);
}
template< typename A >
static iterator begin( A& a )

4
test/adaptor_test/chained.cpp
View File

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

3
test/adaptor_test/transformed.cpp
View File

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

3
test/algorithm.cpp
View File

@ -35,9 +35,8 @@
#endif
#include <boost/assign.hpp>
#include <boost/config.hpp>
#include <boost/config.hpp>
#include <boost/array.hpp>
#include <boost/bind.hpp>
#include <boost/range/numeric.hpp>
#include <boost/range/algorithm.hpp>
#include <boost/range/value_type.hpp>

1
test/algorithm_test/binary_search.cpp
View File

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

1
test/algorithm_test/equal_range.cpp
View File

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

1
test/algorithm_test/generate.cpp
View File

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

1
test/algorithm_test/heap.cpp
View File

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

1
test/algorithm_test/includes.cpp
View File

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

1
test/algorithm_test/inplace_merge.cpp
View File

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

1
test/algorithm_test/lower_bound.cpp
View File

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

1
test/algorithm_test/max_element.cpp
View File

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

1
test/algorithm_test/merge.cpp
View File

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

1
test/algorithm_test/min_element.cpp
View File

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

1
test/algorithm_test/nth_element.cpp
View File

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

1
test/algorithm_test/partial_sort.cpp
View File

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

1
test/algorithm_test/partition.cpp
View File

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

1
test/algorithm_test/random_shuffle.cpp
View File

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

1
test/algorithm_test/remove.cpp
View File

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

1
test/algorithm_test/remove_copy.cpp
View File

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

4
test/algorithm_test/remove_copy_if.cpp
View File

@ -14,7 +14,7 @@
#include <boost/test/unit_test.hpp>
#include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <algorithm>
#include <functional>
#include <list>
@ -64,6 +64,8 @@ namespace
template< class Container >
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::not_equal_to<int>(), _1, to_remove));
}

4
test/algorithm_test/remove_if.cpp
View File

@ -14,7 +14,7 @@
#include <boost/test/unit_test.hpp>
#include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <algorithm>
#include <functional>
#include <list>
@ -59,6 +59,8 @@ namespace boost
template< class Container >
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::not_equal_to<int>(), _1, to_remove));
}

1
test/algorithm_test/replace_copy.cpp
View File

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

4
test/algorithm_test/replace_copy_if.cpp
View File

@ -14,7 +14,7 @@
#include <boost/test/unit_test.hpp>
#include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include <algorithm>
#include <functional>
#include <list>
@ -66,6 +66,8 @@ namespace
template< class Container >
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::not_equal_to<int>(), _1, to_replace));
}

4
test/algorithm_test/replace_if.cpp
View File

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

1
test/algorithm_test/reverse.cpp
View File

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

1
test/algorithm_test/reverse_copy.cpp
View File

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

1
test/algorithm_test/rotate.cpp
View File

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

1
test/algorithm_test/rotate_copy.cpp
View File

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

1
test/algorithm_test/set_difference.cpp
View File

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

1
test/algorithm_test/set_intersection.cpp
View File

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

1
test/algorithm_test/set_symmetric_difference.cpp
View File

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

1
test/algorithm_test/set_union.cpp
View File

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

1
test/algorithm_test/sort.cpp
View File

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

1
test/algorithm_test/stable_partition.cpp
View File

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

1
test/algorithm_test/stable_sort.cpp
View File

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

1
test/algorithm_test/swap_ranges.cpp
View File

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

1
test/algorithm_test/unique.cpp
View File

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

1
test/algorithm_test/unique_copy.cpp
View File

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

1
test/algorithm_test/upper_bound.cpp
View File

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

7
test/string.cpp
View File

@ -28,6 +28,7 @@
#include <boost/config.hpp>
#include <vector>
#include <fstream>
#include <iterator>
#include <algorithm>
namespace
@ -146,7 +147,7 @@ void check_char()
char* char_s2 = a_string.mutable_sz();
BOOST_STATIC_ASSERT(( is_same< range_value<char_iterator_t>::type,
detail::iterator_traits<char_iterator_t>::value_type>::value ));
std::iterator_traits<char_iterator_t>::value_type>::value ));
BOOST_STATIC_ASSERT(( is_same< range_iterator<char_iterator_t>::type, char_iterator_t >::value ));
BOOST_STATIC_ASSERT(( is_same< range_difference<char_iterator_t>::type,
@ -225,11 +226,11 @@ void check_string()
wchar_t* char_ws2 = a_wide_string.mutable_sz();
BOOST_STATIC_ASSERT(( is_same< range_value<wchar_iterator_t>::type,
detail::iterator_traits<wchar_iterator_t>::value_type>::value ));
std::iterator_traits<wchar_iterator_t>::value_type>::value ));
BOOST_STATIC_ASSERT(( is_same< range_iterator<wchar_iterator_t>::type, wchar_iterator_t >::value ));
BOOST_STATIC_ASSERT(( is_same< range_iterator<const wchar_t*>::type, const wchar_t* >::value ));
BOOST_STATIC_ASSERT(( is_same< range_difference<wchar_iterator_t>::type,
detail::iterator_traits<wchar_iterator_t>::difference_type >::value ));
std::iterator_traits<wchar_iterator_t>::difference_type >::value ));
BOOST_STATIC_ASSERT(( is_same< range_size<wchar_iterator_t>::type, std::size_t >::value ));
BOOST_STATIC_ASSERT(( is_same< range_iterator<wchar_iterator_t>::type, wchar_iterator_t >::value ));
BOOST_STATIC_ASSERT(( is_same< range_iterator<const wchar_t*>::type, const wchar_t* >::value ));