From: nesotto_at_[hidden]
Date: 2007-10-27 18:52:30
Author: nesotto
Date: 2007-10-27 18:52:29 EDT (Sat, 27 Oct 2007)
New Revision: 40518
URL: http://svn.boost.org/trac/boost/changeset/40518
Log:
changed range_result_iterator to range_iterator
Text files modified:
trunk/boost/algorithm/string/find.hpp | 22 ++++++++++------------
trunk/boost/algorithm/string/find_iterator.hpp | 10 +++++-----
trunk/boost/algorithm/string/iter_find.hpp | 10 +++++-----
trunk/boost/algorithm/string/regex.hpp | 4 ++--
4 files changed, 22 insertions(+), 24 deletions(-)
Modified: trunk/boost/algorithm/string/find.hpp
==============================================================================
--- trunk/boost/algorithm/string/find.hpp (original)
+++ trunk/boost/algorithm/string/find.hpp 2007-10-27 18:52:29 EDT (Sat, 27 Oct 2007)
@@ -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 @@
*/
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 @@
*/
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 @@
*/
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 @@
*/
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 @@
*/
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 @@
*/
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 @@
*/
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 @@
*/
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 @@
*/
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 @@
*/
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,
Modified: trunk/boost/algorithm/string/find_iterator.hpp
==============================================================================
--- trunk/boost/algorithm/string/find_iterator.hpp (original)
+++ trunk/boost/algorithm/string/find_iterator.hpp 2007-10-27 18:52:29 EDT (Sat, 27 Oct 2007)
@@ -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 @@
*/
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 @@
*/
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);
}
Modified: trunk/boost/algorithm/string/iter_find.hpp
==============================================================================
--- trunk/boost/algorithm/string/iter_find.hpp (original)
+++ trunk/boost/algorithm/string/iter_find.hpp 2007-10-27 18:52:29 EDT (Sat, 27 Oct 2007)
@@ -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 @@
{
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 @@
{
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
Modified: trunk/boost/algorithm/string/regex.hpp
==============================================================================
--- trunk/boost/algorithm/string/regex.hpp (original)
+++ trunk/boost/algorithm/string/regex.hpp 2007-10-27 18:52:29 EDT (Sat, 27 Oct 2007)
@@ -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 @@
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,