restart of branch, this is to include changes from trunk

[SVN r40545]
changed range_result_iterator to range_iterator
2025-10-09 22:30:54 +02:00 · 2007-10-29 12:39:01 +00:00 · 2007-10-27 22:52:29 +00:00 · 2007-09-28 07:19:29 +00:00 · 2007-09-25 08:46:31 +00:00
4 changed files with 22 additions and 24 deletions
--- a/include/boost/algorithm/string/find.hpp
+++ b/include/boost/algorithm/string/find.hpp
@@ -17,8 +17,6 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/iterator.hpp>
-#include <boost/range/const_iterator.hpp>
-#include <boost/range/result_iterator.hpp>
 #include <boost/range/as_literal.hpp>

 #include <boost/algorithm/string/finder.hpp>
@@ -50,7 +48,7 @@ namespace boost {
        */
        template<typename RangeT, typename FinderT>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        find( 
            RangeT& Input, 
            const FinderT& Finder)
@@ -78,7 +76,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        find_first( 
            Range1T& Input, 
            const Range2T& Search)
@@ -104,7 +102,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        ifind_first( 
            Range1T& Input, 
            const Range2T& Search,
@@ -131,7 +129,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        find_last( 
            Range1T& Input, 
            const Range2T& Search)
@@ -157,7 +155,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        ifind_last( 
            Range1T& Input, 
            const Range2T& Search,
@@ -185,7 +183,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        find_nth( 
            Range1T& Input, 
            const Range2T& Search,
@@ -215,7 +213,7 @@ namespace boost {
        */
        template<typename Range1T, typename Range2T>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<Range1T>::type>
+            BOOST_STRING_TYPENAME range_iterator<Range1T>::type>
        ifind_nth( 
            Range1T& Input, 
            const Range2T& Search,
@@ -247,7 +245,7 @@ namespace boost {
        */
        template<typename RangeT>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        find_head( 
            RangeT& Input, 
            int N)
@@ -278,7 +276,7 @@ namespace boost {
        */
        template<typename RangeT>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        find_tail( 
            RangeT& Input, 
            int N)
@@ -307,7 +305,7 @@ namespace boost {
        */
        template<typename RangeT, typename PredicateT>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        find_token( 
            RangeT& Input,
            PredicateT Pred,
--- a/include/boost/algorithm/string/find_iterator.hpp
+++ b/include/boost/algorithm/string/find_iterator.hpp
@@ -18,7 +18,7 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
-#include <boost/range/result_iterator.hpp>
+#include <boost/range/iterator.hpp>
 #include <boost/range/as_literal.hpp>

 #include <boost/algorithm/string/detail/find_iterator.hpp>
@@ -185,12 +185,12 @@ namespace boost {
         */
        template<typename RangeT, typename FinderT>
        inline find_iterator< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        make_find_iterator(
            RangeT& Collection,
            FinderT Finder)
        {
-            return find_iterator<BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>(
+            return find_iterator<BOOST_STRING_TYPENAME range_iterator<RangeT>::type>(
                Collection, Finder);
        }

@@ -363,12 +363,12 @@ namespace boost {
         */
        template<typename RangeT, typename FinderT>
        inline split_iterator< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
        make_split_iterator(
            RangeT& Collection,
            FinderT Finder)
        {
-            return split_iterator<BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type>(
+            return split_iterator<BOOST_STRING_TYPENAME range_iterator<RangeT>::type>(
                Collection, Finder);
        }

--- a/include/boost/algorithm/string/iter_find.hpp
+++ b/include/boost/algorithm/string/iter_find.hpp
@@ -19,7 +19,7 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
-#include <boost/range/result_iterator.hpp>
+#include <boost/range/iterator.hpp>
 #include <boost/range/value_type.hpp>
 #include <boost/range/as_literal.hpp>

@@ -76,12 +76,12 @@ namespace boost {
        {
            function_requires< 
                FinderConcept<FinderT,
-                BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type> >();
+                BOOST_STRING_TYPENAME range_iterator<RangeT>::type> >();

            iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));

            typedef BOOST_STRING_TYPENAME 
-                range_result_iterator<RangeT>::type input_iterator_type;
+                range_iterator<RangeT>::type input_iterator_type;
            typedef find_iterator<input_iterator_type> find_iterator_type;
            typedef detail::copy_iterator_rangeF<
                BOOST_STRING_TYPENAME 
@@ -145,12 +145,12 @@ namespace boost {
        {
            function_requires< 
                FinderConcept<FinderT,
-                BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type> >();
+                BOOST_STRING_TYPENAME range_iterator<RangeT>::type> >();

            iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));

            typedef BOOST_STRING_TYPENAME 
-                range_result_iterator<RangeT>::type input_iterator_type;
+                range_iterator<RangeT>::type input_iterator_type;
            typedef split_iterator<input_iterator_type> find_iterator_type;
            typedef detail::copy_iterator_rangeF<
                BOOST_STRING_TYPENAME 
--- a/include/boost/algorithm/string/regex.hpp
+++ b/include/boost/algorithm/string/regex.hpp
@@ -17,7 +17,7 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
-#include <boost/range/result_iterator.hpp>
+#include <boost/range/iterator.hpp>
 #include <boost/range/as_literal.hpp>

 #include <boost/algorithm/string/find_format.hpp>
@@ -54,7 +54,7 @@ namespace boost {
            typename CharT, 
            typename RegexTraitsT>
        inline iterator_range< 
-            BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type >
+            BOOST_STRING_TYPENAME range_iterator<RangeT>::type >
        find_regex( 
            RangeT& Input, 
            const basic_regex<CharT, RegexTraitsT>& Rx,
Author	SHA1	Message	Date
Frank Birbacher	3e9f1e4ea1	restart of branch, this is to include changes from trunk [SVN r40545]	2007-10-29 12:39:01 +00:00
Thorsten Jørgen Ottosen	1541a554f5	changed range_result_iterator to range_iterator [SVN r40518]	2007-10-27 22:52:29 +00:00
Markus Schöpflin	7a97b3390e	Added missing include. [SVN r39586]	2007-09-28 07:19:29 +00:00
Markus Schöpflin	6e5a7497ae	Added missing include. [SVN r39519]	2007-09-25 08:46:31 +00:00