[Boost-commit] svn:boost r40423 - in trunk/boost/range: . detail

From: nesotto_at_[hidden]
Date: 2007-10-24 11:19:17

Author: nesotto
Date: 2007-10-24 11:19:16 EDT (Wed, 24 Oct 2007)
New Revision: 40423
URL: http://svn.boost.org/trac/boost/changeset/40423

Log:
roll-back of ADL names
Text files modified: 
   trunk/boost/range/begin.hpp            |    14 +++++++-------                          
   trunk/boost/range/detail/microsoft.hpp |     4 ++--                                    
   trunk/boost/range/end.hpp              |    14 +++++++-------                          
   3 files changed, 16 insertions(+), 16 deletions(-)

Modified: trunk/boost/range/begin.hpp
==============================================================================
--- trunk/boost/range/begin.hpp	(original)
+++ trunk/boost/range/begin.hpp	2007-10-24 11:19:16 EDT (Wed, 24 Oct 2007)
@@ -39,7 +39,7 @@
 
     template< typename C >
     inline BOOST_DEDUCED_TYPENAME range_iterator<C>::type
-    boost_range_begin( C& c )
+    range_begin( C& c )
     {
         return c.begin();
     }
@@ -49,13 +49,13 @@
     //////////////////////////////////////////////////////////////////////
 
     template< typename Iterator >
-    inline Iterator boost_range_begin( const std::pair<Iterator,Iterator>& p )
+    inline Iterator range_begin( const std::pair<Iterator,Iterator>& p )
     {
         return p.first;
     }
 
     template< typename Iterator >
-    inline Iterator boost_range_begin( std::pair<Iterator,Iterator>& p )
+    inline Iterator range_begin( std::pair<Iterator,Iterator>& p )
     {
         return p.first;
     }
@@ -68,13 +68,13 @@
     // 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 @@
     /**/
     using namespace range_detail;
 #endif
-    return boost_range_begin( r );
+    return range_begin( r );
 }
 
 template< class T >
@@ -106,7 +106,7 @@
     /**/
     using namespace range_detail;
 #endif
-    return boost_range_begin( r );
+    return range_begin( r );
 }
 
 } // namespace boost

Modified: trunk/boost/range/detail/microsoft.hpp
==============================================================================
--- trunk/boost/range/detail/microsoft.hpp	(original)
+++ trunk/boost/range/detail/microsoft.hpp	2007-10-24 11:19:16 EDT (Wed, 24 Oct 2007)
@@ -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
 
 

Modified: trunk/boost/range/end.hpp
==============================================================================
--- trunk/boost/range/end.hpp	(original)
+++ trunk/boost/range/end.hpp	2007-10-24 11:19:16 EDT (Wed, 24 Oct 2007)
@@ -40,7 +40,7 @@
         //////////////////////////////////////////////////////////////////////
         template< typename C >
         inline BOOST_DEDUCED_TYPENAME range_iterator<C>::type
-        boost_range_end( C& c )
+        range_end( C& c )
         {
             return c.end();
         }
@@ -50,13 +50,13 @@
         //////////////////////////////////////////////////////////////////////
 
         template< typename Iterator >
-        inline Iterator boost_range_end( const std::pair<Iterator,Iterator>& p )
+        inline Iterator range_end( const std::pair<Iterator,Iterator>& p )
         {
             return p.second;
         }
 
         template< typename Iterator >
-        inline Iterator boost_range_end( std::pair<Iterator,Iterator>& p )
+        inline Iterator range_end( std::pair<Iterator,Iterator>& p )
         {
             return p.second;
         }
@@ -66,13 +66,13 @@
         //////////////////////////////////////////////////////////////////////
 
         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<T,sz>( 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<T,sz>( array );
         }
@@ -91,7 +91,7 @@
     /**/
     using namespace range_detail;
 #endif
-    return boost_range_end( r );
+    return range_end( r );
 }
 
 template< class T >
@@ -102,7 +102,7 @@
     /**/
     using namespace range_detail;
 #endif
-    return boost_range_end( r );
+    return range_end( r );
 }
 
 } // namespace 'boost'