diff --git a/doc/foreach.qbk b/doc/foreach.qbk index 99f1965..3cf809e 100755 --- a/doc/foreach.qbk +++ b/doc/foreach.qbk @@ -208,15 +208,15 @@ which contains two iterators into a `std::string`. /* ... implementation ... */ }; - // Add overloads of boost_range_begin() and boost_range_end() in the + // Add overloads of range_begin() and range_end() in the // same namespace as sub_string, to be found by Argument-Dependent Lookup. - inline std::string::iterator boost_range_begin( sub_string & x ) + inline std::string::iterator range_begin( sub_string & x ) { return x.begin; } - inline std::string::iterator boost_range_end( sub_string & x ) + inline std::string::iterator range_end( sub_string & x ) { return x.end; } @@ -224,12 +224,12 @@ which contains two iterators into a `std::string`. // Also add overloads for const sub_strings. Note we use the conversion // from string::iterator to string::const_iterator here. - inline std::string::const_iterator boost_range_begin( sub_string const & x ) + inline std::string::const_iterator range_begin( sub_string const & x ) { return x.begin; } - inline std::string::const_iterator boost_range_end( sub_string const & x ) + inline std::string::const_iterator range_end( sub_string const & x ) { return x.end; } @@ -237,9 +237,9 @@ which contains two iterators into a `std::string`. namespace boost { - // specialize rannge_iterator and range_const_iterator in namespace boost + // specialize range_mutable_iterator and range_const_iterator in namespace boost template<> - struct range_iterator< my::sub_string > + struct range_mutable_iterator< my::sub_string > { typedef std::string::iterator type; }; diff --git a/test/array_byref.cpp b/test/array_byref.cpp index 3723f64..7fce4ca 100755 --- a/test/array_byref.cpp +++ b/test/array_byref.cpp @@ -22,7 +22,7 @@ typedef int const &foreach_const_reference_type; #include "./utility.hpp" /////////////////////////////////////////////////////////////////////////////// -// define come containers +// define some containers // int my_array[5] = { 1,2,3,4,5 }; int const (&my_const_array)[5] = my_array; diff --git a/test/array_byval.cpp b/test/array_byval.cpp index 3d60b5c..34e2011 100755 --- a/test/array_byval.cpp +++ b/test/array_byval.cpp @@ -22,7 +22,7 @@ typedef int const &foreach_const_reference_type; #include "./utility.hpp" /////////////////////////////////////////////////////////////////////////////// -// define come containers +// define some containers // int my_array[5] = { 1,2,3,4,5 }; int const (&my_const_array)[5] = my_array; diff --git a/test/cstr_byref.cpp b/test/cstr_byref.cpp index 1c01675..f25611e 100755 --- a/test/cstr_byref.cpp +++ b/test/cstr_byref.cpp @@ -22,7 +22,7 @@ typedef char const &foreach_const_reference_type; #include "./utility.hpp" /////////////////////////////////////////////////////////////////////////////// -// define come containers +// define some containers // char my_ntcs_buffer[] = "\1\2\3\4\5"; char *my_ntcs = my_ntcs_buffer; diff --git a/test/cstr_byval.cpp b/test/cstr_byval.cpp index dcfe544..b556832 100755 --- a/test/cstr_byval.cpp +++ b/test/cstr_byval.cpp @@ -22,7 +22,7 @@ typedef char const &foreach_const_reference_type; #include "./utility.hpp" /////////////////////////////////////////////////////////////////////////////// -// define come containers +// define some containers // char my_ntcs_buffer[] = "\1\2\3\4\5"; char *my_ntcs = my_ntcs_buffer; diff --git a/test/pair_byref.cpp b/test/pair_byref.cpp index dc17ae1..5df3752 100755 --- a/test/pair_byref.cpp +++ b/test/pair_byref.cpp @@ -23,7 +23,7 @@ typedef int const &foreach_const_reference_type; #include "./utility.hpp" /////////////////////////////////////////////////////////////////////////////// -// define come containers +// define some containers // int my_array[] = { 1,2,3,4,5 }; std::pair my_pair(my_array,my_array+5); diff --git a/test/pair_byval.cpp b/test/pair_byval.cpp index 446b5c6..18233af 100755 --- a/test/pair_byval.cpp +++ b/test/pair_byval.cpp @@ -22,7 +22,7 @@ typedef int const &foreach_const_reference_type; #include "./utility.hpp" /////////////////////////////////////////////////////////////////////////////// -// define come containers +// define some containers // int my_array[] = { 1,2,3,4,5 }; std::pair my_pair(my_array,my_array+5); diff --git a/test/stl_byref.cpp b/test/stl_byref.cpp index e9d60b8..be9b004 100755 --- a/test/stl_byref.cpp +++ b/test/stl_byref.cpp @@ -36,7 +36,7 @@ std::list make_list() } /////////////////////////////////////////////////////////////////////////////// -// define come containers +// define some containers // std::list my_list = make_list(); std::list const &my_const_list = my_list; diff --git a/test/stl_byval.cpp b/test/stl_byval.cpp index 17825f4..e03f908 100755 --- a/test/stl_byval.cpp +++ b/test/stl_byval.cpp @@ -38,7 +38,7 @@ std::list make_list() } /////////////////////////////////////////////////////////////////////////////// -// define come containers +// define some containers // std::list my_list = make_list(); std::list const &my_const_list = my_list; diff --git a/test/user_defined.cpp b/test/user_defined.cpp index 5f378a9..1cb4a44 100755 --- a/test/user_defined.cpp +++ b/test/user_defined.cpp @@ -20,10 +20,10 @@ namespace mine namespace boost { - char * boost_range_begin(mine::dummy&) {return 0;} - char const * boost_range_begin(mine::dummy const&) {return 0;} - char * boost_range_end(mine::dummy&) {return 0;} - char const * boost_range_end(mine::dummy const&) {return 0;} + char * range_begin(mine::dummy&) {return 0;} + char const * range_begin(mine::dummy const&) {return 0;} + char * range_end(mine::dummy&) {return 0;} + char const * range_end(mine::dummy const&) {return 0;} } #include @@ -31,7 +31,7 @@ namespace boost namespace boost { template<> - struct range_iterator + struct range_mutable_iterator { typedef char * type; };