feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

roll-back of ADL names

Browse Source 
[SVN r40423]
This commit is contained in:
Thorsten Jørgen Ottosen
2007-10-24 15:19:16 +00:00
parent 8984de1c74
commit 82768af3d2
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/range/begin.hpp
View File

@ -39,7 +39,7 @@ namespace range_detail
template< typename C > template< typename C >
inline BOOST_DEDUCED_TYPENAME range_iterator<C>::type inline BOOST_DEDUCED_TYPENAME range_iterator<C>::type
boost_range_begin( C& c ) range_begin( C& c )
{ {
return c.begin(); return c.begin();
} }
@ -49,13 +49,13 @@ namespace range_detail
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
template< typename Iterator > 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; return p.first;
} }
template< typename Iterator > 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; return p.first;
} }
@ -68,13 +68,13 @@ namespace range_detail
// May this be discarded? Or is it needed for bad compilers? // May this be discarded? Or is it needed for bad compilers?
// //
template< typename T, std::size_t sz > 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; return array;
} }
template< typename T, std::size_t sz > template< typename T, std::size_t sz >
inline T* boost_range_begin( T (&array)[sz] ) inline T* range_begin( T (&array)[sz] )
{ {
return array; return array;
} }
@ -95,7 +95,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T& r )
/**/ /**/
using namespace range_detail; using namespace range_detail;
#endif #endif
return boost_range_begin( r ); return range_begin( r );
} }
template< class T > template< class T >
@ -106,7 +106,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type begin( const T& r )
/**/ /**/
using namespace range_detail; using namespace range_detail;
#endif #endif
return boost_range_begin( r ); return range_begin( r );
} }
} // namespace boost } // namespace boost

4
include/boost/range/detail/microsoft.hpp
View File

@ -30,8 +30,8 @@
#define BOOST_RANGE_DETAIL_MICROSOFT_range_end range_end #define BOOST_RANGE_DETAIL_MICROSOFT_range_end range_end
#else #else
#define BOOST_RANGE_DETAIL_MICROSOFT_range_mutable_iterator range_mutable_iterator #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_begin range_begin
#define BOOST_RANGE_DETAIL_MICROSOFT_range_end boost_range_end #define BOOST_RANGE_DETAIL_MICROSOFT_range_end range_end
#endif #endif

14
include/boost/range/end.hpp
View File

@ -40,7 +40,7 @@ namespace range_detail
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
template< typename C > template< typename C >
inline BOOST_DEDUCED_TYPENAME range_iterator<C>::type inline BOOST_DEDUCED_TYPENAME range_iterator<C>::type
boost_range_end( C& c ) range_end( C& c )
{ {
return c.end(); return c.end();
} }
@ -50,13 +50,13 @@ namespace range_detail
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
template< typename Iterator > 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; return p.second;
} }
template< typename Iterator > 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; return p.second;
} }
@ -66,13 +66,13 @@ namespace range_detail
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
template< typename T, std::size_t sz > 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 ); return range_detail::array_end<T,sz>( array );
} }
template< typename T, std::size_t sz > 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 ); return range_detail::array_end<T,sz>( array );
} }
@ -91,7 +91,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r )
/**/ /**/
using namespace range_detail; using namespace range_detail;
#endif #endif
return boost_range_end( r ); return range_end( r );
} }
template< class T > template< class T >
@ -102,7 +102,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type end( const T& r )
/**/ /**/
using namespace range_detail; using namespace range_detail;
#endif #endif
return boost_range_end( r ); return range_end( r );
} }
} // namespace 'boost' } // namespace 'boost'