diff --git a/include/boost/range/begin.hpp b/include/boost/range/begin.hpp index 2f2cb3b..e8251c9 100755 --- a/include/boost/range/begin.hpp +++ b/include/boost/range/begin.hpp @@ -39,7 +39,7 @@ namespace range_detail template< typename C > inline BOOST_DEDUCED_TYPENAME range_iterator::type - boost_range_begin( C& c ) + range_begin( C& c ) { return c.begin(); } @@ -49,13 +49,13 @@ namespace range_detail ////////////////////////////////////////////////////////////////////// template< typename Iterator > - inline Iterator boost_range_begin( const std::pair& p ) + inline Iterator range_begin( const std::pair& p ) { return p.first; } template< typename Iterator > - inline Iterator boost_range_begin( std::pair& p ) + inline Iterator range_begin( std::pair& p ) { return p.first; } @@ -68,13 +68,13 @@ namespace range_detail // May this be discarded? Or is it needed for bad compilers? // template< typename T, std::size_t sz > - inline const T* boost_range_begin( const T (&array)[sz] ) + inline const T* range_begin( const T (&array)[sz] ) { return array; } template< typename T, std::size_t sz > - inline T* boost_range_begin( T (&array)[sz] ) + inline T* range_begin( T (&array)[sz] ) { return array; } @@ -95,7 +95,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator::type begin( T& r ) /**/ using namespace range_detail; #endif - return boost_range_begin( r ); + return range_begin( r ); } template< class T > @@ -106,7 +106,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator::type begin( const T& r ) /**/ using namespace range_detail; #endif - return boost_range_begin( r ); + return range_begin( r ); } } // namespace boost diff --git a/include/boost/range/detail/microsoft.hpp b/include/boost/range/detail/microsoft.hpp index 6dfe1ca..2c4b1ed 100644 --- a/include/boost/range/detail/microsoft.hpp +++ b/include/boost/range/detail/microsoft.hpp @@ -30,8 +30,8 @@ #define BOOST_RANGE_DETAIL_MICROSOFT_range_end range_end #else #define BOOST_RANGE_DETAIL_MICROSOFT_range_mutable_iterator range_mutable_iterator - #define BOOST_RANGE_DETAIL_MICROSOFT_range_begin boost_range_begin - #define BOOST_RANGE_DETAIL_MICROSOFT_range_end boost_range_end + #define BOOST_RANGE_DETAIL_MICROSOFT_range_begin range_begin + #define BOOST_RANGE_DETAIL_MICROSOFT_range_end range_end #endif diff --git a/include/boost/range/end.hpp b/include/boost/range/end.hpp index 59bae67..be2f495 100755 --- a/include/boost/range/end.hpp +++ b/include/boost/range/end.hpp @@ -40,7 +40,7 @@ namespace range_detail ////////////////////////////////////////////////////////////////////// template< typename C > inline BOOST_DEDUCED_TYPENAME range_iterator::type - boost_range_end( C& c ) + range_end( C& c ) { return c.end(); } @@ -50,13 +50,13 @@ namespace range_detail ////////////////////////////////////////////////////////////////////// template< typename Iterator > - inline Iterator boost_range_end( const std::pair& p ) + inline Iterator range_end( const std::pair& p ) { return p.second; } template< typename Iterator > - inline Iterator boost_range_end( std::pair& p ) + inline Iterator range_end( std::pair& p ) { return p.second; } @@ -66,13 +66,13 @@ namespace range_detail ////////////////////////////////////////////////////////////////////// template< typename T, std::size_t sz > - inline const T* boost_range_end( const T (&array)[sz] ) + inline const T* range_end( const T (&array)[sz] ) { return range_detail::array_end( array ); } template< typename T, std::size_t sz > - inline T* boost_range_end( T (&array)[sz] ) + inline T* range_end( T (&array)[sz] ) { return range_detail::array_end( array ); } @@ -91,7 +91,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator::type end( T& r ) /**/ using namespace range_detail; #endif - return boost_range_end( r ); + return range_end( r ); } template< class T > @@ -102,7 +102,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator::type end( const T& r ) /**/ using namespace range_detail; #endif - return boost_range_end( r ); + return range_end( r ); } } // namespace 'boost'