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

Remove a few leftover uses of boost/detail/iterator.hpp.

Browse Source
This commit is contained in:
Andrey Semashev
2020-05-11 18:42:15 +03:00
parent cfb7c429f7
commit 8710bbd4b6
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/algorithm/string/find_format.hpp
View File

@ -12,7 +12,6 @@
#define BOOST_STRING_FIND_FORMAT_HPP #define BOOST_STRING_FIND_FORMAT_HPP
#include <deque> #include <deque>
#include <boost/detail/iterator.hpp>
#include <boost/range/iterator_range_core.hpp> #include <boost/range/iterator_range_core.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
@ -40,7 +39,7 @@ namespace boost {
this substring and replace it in the input. this substring and replace it in the input.
The result is a modified copy of the input. It is returned as a sequence The result is a modified copy of the input. It is returned as a sequence
or copied to the output iterator. or copied to the output iterator.
\param Output An output iterator to which the result will be copied \param Output An output iterator to which the result will be copied
\param Input An input sequence \param Input An input sequence
\param Finder A Finder object used to search for a match to be replaced \param Finder A Finder object used to search for a match to be replaced

1
include/boost/algorithm/string/formatter.hpp
View File

@ -11,7 +11,6 @@
#ifndef BOOST_STRING_FORMATTER_HPP #ifndef BOOST_STRING_FORMATTER_HPP
#define BOOST_STRING_FORMATTER_HPP #define BOOST_STRING_FORMATTER_HPP
#include <boost/detail/iterator.hpp>
#include <boost/range/value_type.hpp> #include <boost/range/value_type.hpp>
#include <boost/range/iterator_range_core.hpp> #include <boost/range/iterator_range_core.hpp>
#include <boost/range/as_literal.hpp> #include <boost/range/as_literal.hpp>

10
string/example/rle_example.cpp
View File

@ -16,7 +16,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <limits> #include <limits>
#include <boost/detail/iterator.hpp> #include <iterator>
#include <boost/algorithm/string/find_format.hpp> #include <boost/algorithm/string/find_format.hpp>
#include <boost/algorithm/string/finder.hpp> #include <boost/algorithm/string/finder.hpp>
@ -46,7 +46,7 @@ struct find_compressF
ForwardIteratorT End ) const ForwardIteratorT End ) const
{ {
typedef ForwardIteratorT input_iterator_type; typedef ForwardIteratorT input_iterator_type;
typedef typename boost::detail::iterator_traits<input_iterator_type>::value_type value_type; typedef typename std::iterator_traits<input_iterator_type>::value_type value_type;
typedef iterator_range<input_iterator_type> result_type; typedef iterator_range<input_iterator_type> result_type;
// begin of the matching segment // begin of the matching segment
@ -144,7 +144,7 @@ struct find_decompressF
ForwardIteratorT End ) const ForwardIteratorT End ) const
{ {
typedef ForwardIteratorT input_iterator_type; typedef ForwardIteratorT input_iterator_type;
typedef typename boost::detail::iterator_traits<input_iterator_type>::value_type value_type; typedef typename std::iterator_traits<input_iterator_type>::value_type value_type;
typedef iterator_range<input_iterator_type> result_type; typedef iterator_range<input_iterator_type> result_type;
for(input_iterator_type It=Begin; It!=End; It++) for(input_iterator_type It=Begin; It!=End; It++)
@ -153,12 +153,12 @@ struct find_decompressF
{ {
// Repeat mark found, extract body // Repeat mark found, extract body
input_iterator_type It2=It++; input_iterator_type It2=It++;
if ( It==End ) break; if ( It==End ) break;
It++; It++;
if ( It==End ) break; if ( It==End ) break;
It++; It++;
return result_type( It2, It ); return result_type( It2, It );
} }
} }