boostorg/algorithm
1
0
Fork 1
mirror of https://github.com/boostorg/algorithm.git synced 2025-07-06 09:16:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

changed range_result_iterator to range_iterator

Browse Source 
[SVN r40518]
This commit is contained in:
Thorsten Jørgen Ottosen
2007-10-27 22:52:29 +00:00
parent 7a97b3390e
commit 1541a554f5
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/boost/algorithm/string/find.hpp
View File

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

10
include/boost/algorithm/string/find_iterator.hpp
View File

@ -18,7 +18,7 @@
#include <boost/range/iterator_range.hpp> #include <boost/range/iterator_range.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.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/range/as_literal.hpp>
#include <boost/algorithm/string/detail/find_iterator.hpp> #include <boost/algorithm/string/detail/find_iterator.hpp>
@ -185,12 +185,12 @@ namespace boost {
*/ */
template<typename RangeT, typename FinderT> template<typename RangeT, typename FinderT>
inline find_iterator< inline find_iterator<
BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type> BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
make_find_iterator( make_find_iterator(
RangeT& Collection, RangeT& Collection,
FinderT Finder) 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); Collection, Finder);
} }
@ -363,12 +363,12 @@ namespace boost {
*/ */
template<typename RangeT, typename FinderT> template<typename RangeT, typename FinderT>
inline split_iterator< inline split_iterator<
BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type> BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
make_split_iterator( make_split_iterator(
RangeT& Collection, RangeT& Collection,
FinderT Finder) 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); Collection, Finder);
} }

10
include/boost/algorithm/string/iter_find.hpp
View File

@ -19,7 +19,7 @@
#include <boost/range/iterator_range.hpp> #include <boost/range/iterator_range.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.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/value_type.hpp>
#include <boost/range/as_literal.hpp> #include <boost/range/as_literal.hpp>
@ -76,12 +76,12 @@ namespace boost {
{ {
function_requires< function_requires<
FinderConcept<FinderT, 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)); iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
typedef BOOST_STRING_TYPENAME 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 find_iterator<input_iterator_type> find_iterator_type;
typedef detail::copy_iterator_rangeF< typedef detail::copy_iterator_rangeF<
BOOST_STRING_TYPENAME BOOST_STRING_TYPENAME
@ -145,12 +145,12 @@ namespace boost {
{ {
function_requires< function_requires<
FinderConcept<FinderT, 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)); iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
typedef BOOST_STRING_TYPENAME 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 split_iterator<input_iterator_type> find_iterator_type;
typedef detail::copy_iterator_rangeF< typedef detail::copy_iterator_rangeF<
BOOST_STRING_TYPENAME BOOST_STRING_TYPENAME

4
include/boost/algorithm/string/regex.hpp
View File

@ -17,7 +17,7 @@
#include <boost/range/iterator_range.hpp> #include <boost/range/iterator_range.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.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/range/as_literal.hpp>
#include <boost/algorithm/string/find_format.hpp> #include <boost/algorithm/string/find_format.hpp>
@ -54,7 +54,7 @@ namespace boost {
typename CharT, typename CharT,
typename RegexTraitsT> typename RegexTraitsT>
inline iterator_range< inline iterator_range<
BOOST_STRING_TYPENAME range_result_iterator<RangeT>::type > BOOST_STRING_TYPENAME range_iterator<RangeT>::type >
find_regex( find_regex(
RangeT& Input, RangeT& Input,
const basic_regex<CharT, RegexTraitsT>& Rx, const basic_regex<CharT, RegexTraitsT>& Rx,