feedc0de/boost_algorithm
1
0
Fork 0
forked from boostorg/algorithm
Code Pull Requests Activity

Avoid using deprecated header boost/detail/iterator.hpp.

Browse Source 
This header is deprecated in favor of <iterator> and will be removed in a
future release. This silences deprecation warnings.
This commit is contained in:
Andrey Semashev
2020-05-11 17:21:24 +03:00
parent 6d86fb3aaa
commit ed4033f0cc
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/algorithm/string/detail/finder.hpp
View File

@ -13,7 +13,7 @@
#include <boost/algorithm/string/config.hpp> #include <boost/algorithm/string/config.hpp>
#include <boost/algorithm/string/constants.hpp> #include <boost/algorithm/string/constants.hpp>
#include <boost/detail/iterator.hpp> #include <iterator>
#include <boost/range/iterator_range_core.hpp> #include <boost/range/iterator_range_core.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
@ -127,8 +127,8 @@ namespace boost {
if( boost::empty(m_Search) ) if( boost::empty(m_Search) )
return result_type( End, End ); return result_type( End, End );
typedef BOOST_STRING_TYPENAME boost::detail:: typedef BOOST_STRING_TYPENAME
iterator_traits<ForwardIteratorT>::iterator_category category; std::iterator_traits<ForwardIteratorT>::iterator_category category;
return findit( Begin, End, category() ); return findit( Begin, End, category() );
} }
@ -375,8 +375,8 @@ namespace boost {
ForwardIteratorT End, ForwardIteratorT End,
unsigned int N ) unsigned int N )
{ {
typedef BOOST_STRING_TYPENAME boost::detail:: typedef BOOST_STRING_TYPENAME
iterator_traits<ForwardIteratorT>::iterator_category category; std::iterator_traits<ForwardIteratorT>::iterator_category category;
return ::boost::algorithm::detail::find_head_impl( Begin, End, N, category() ); return ::boost::algorithm::detail::find_head_impl( Begin, End, N, category() );
} }
@ -448,8 +448,8 @@ namespace boost {
ForwardIteratorT End, ForwardIteratorT End,
unsigned int N ) unsigned int N )
{ {
typedef BOOST_STRING_TYPENAME boost::detail:: typedef BOOST_STRING_TYPENAME
iterator_traits<ForwardIteratorT>::iterator_category category; std::iterator_traits<ForwardIteratorT>::iterator_category category;
return ::boost::algorithm::detail::find_tail_impl( Begin, End, N, category() ); return ::boost::algorithm::detail::find_tail_impl( Begin, End, N, category() );
} }

6
include/boost/algorithm/string/detail/trim.hpp
View File

@ -12,7 +12,7 @@
#define BOOST_STRING_TRIM_DETAIL_HPP #define BOOST_STRING_TRIM_DETAIL_HPP
#include <boost/algorithm/string/config.hpp> #include <boost/algorithm/string/config.hpp>
#include <boost/detail/iterator.hpp> #include <iterator>
namespace boost { namespace boost {
namespace algorithm { namespace algorithm {
@ -80,8 +80,8 @@ namespace boost {
ForwardIteratorT InEnd, ForwardIteratorT InEnd,
PredicateT IsSpace ) PredicateT IsSpace )
{ {
typedef BOOST_STRING_TYPENAME boost::detail:: typedef BOOST_STRING_TYPENAME
iterator_traits<ForwardIteratorT>::iterator_category category; std::iterator_traits<ForwardIteratorT>::iterator_category category;
return ::boost::algorithm::detail::trim_end_iter_select( InBegin, InEnd, IsSpace, category() ); return ::boost::algorithm::detail::trim_end_iter_select( InBegin, InEnd, IsSpace, category() );
} }

7
include/boost/algorithm/string/predicate.hpp
View File

@ -11,6 +11,7 @@
#ifndef BOOST_STRING_PREDICATE_HPP #ifndef BOOST_STRING_PREDICATE_HPP
#define BOOST_STRING_PREDICATE_HPP #define BOOST_STRING_PREDICATE_HPP
#include <iterator>
#include <boost/algorithm/string/config.hpp> #include <boost/algorithm/string/config.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
@ -144,10 +145,10 @@ namespace boost {
iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(::boost::as_literal(Input)); iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(::boost::as_literal(Input));
iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(::boost::as_literal(Test)); iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(::boost::as_literal(Test));
typedef BOOST_STRING_TYPENAME typedef BOOST_STRING_TYPENAME
range_const_iterator<Range1T>::type Iterator1T; range_const_iterator<Range1T>::type Iterator1T;
typedef BOOST_STRING_TYPENAME boost::detail:: typedef BOOST_STRING_TYPENAME
iterator_traits<Iterator1T>::iterator_category category; std::iterator_traits<Iterator1T>::iterator_category category;
return detail:: return detail::
ends_with_iter_select( ends_with_iter_select(