From 8710bbd4b698c331725dee6dccc6fdedcc0e5e85 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Mon, 11 May 2020 18:42:15 +0300 Subject: [PATCH] Remove a few leftover uses of boost/detail/iterator.hpp. --- include/boost/algorithm/string/find_format.hpp | 3 +-- include/boost/algorithm/string/formatter.hpp | 1 - string/example/rle_example.cpp | 10 +++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/boost/algorithm/string/find_format.hpp b/include/boost/algorithm/string/find_format.hpp index 0e84a4e..4d9315c 100644 --- a/include/boost/algorithm/string/find_format.hpp +++ b/include/boost/algorithm/string/find_format.hpp @@ -12,7 +12,6 @@ #define BOOST_STRING_FIND_FORMAT_HPP #include -#include #include #include #include @@ -40,7 +39,7 @@ namespace boost { this substring and replace it in the input. The result is a modified copy of the input. It is returned as a sequence or copied to the output iterator. - + \param Output An output iterator to which the result will be copied \param Input An input sequence \param Finder A Finder object used to search for a match to be replaced diff --git a/include/boost/algorithm/string/formatter.hpp b/include/boost/algorithm/string/formatter.hpp index de8681b..0e08ae7 100644 --- a/include/boost/algorithm/string/formatter.hpp +++ b/include/boost/algorithm/string/formatter.hpp @@ -11,7 +11,6 @@ #ifndef BOOST_STRING_FORMATTER_HPP #define BOOST_STRING_FORMATTER_HPP -#include #include #include #include diff --git a/string/example/rle_example.cpp b/string/example/rle_example.cpp index 9e52b96..ff47ccc 100644 --- a/string/example/rle_example.cpp +++ b/string/example/rle_example.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -46,7 +46,7 @@ struct find_compressF ForwardIteratorT End ) const { typedef ForwardIteratorT input_iterator_type; - typedef typename boost::detail::iterator_traits::value_type value_type; + typedef typename std::iterator_traits::value_type value_type; typedef iterator_range result_type; // begin of the matching segment @@ -144,7 +144,7 @@ struct find_decompressF ForwardIteratorT End ) const { typedef ForwardIteratorT input_iterator_type; - typedef typename boost::detail::iterator_traits::value_type value_type; + typedef typename std::iterator_traits::value_type value_type; typedef iterator_range result_type; for(input_iterator_type It=Begin; It!=End; It++) @@ -153,12 +153,12 @@ struct find_decompressF { // Repeat mark found, extract body input_iterator_type It2=It++; - + if ( It==End ) break; It++; if ( It==End ) break; It++; - + return result_type( It2, It ); } }