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

updated so ADL kick in in iterator_range and const_begin/const_end

Browse Source 
[SVN r28562]
This commit is contained in:
Thorsten Jørgen Ottosen
2005-05-01 22:58:25 +00:00
parent b358ea0773
commit a02b6c0f74
4 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,7 +179,7 @@ namespace boost
inline BOOST_DEDUCED_TYPENAME range_const_iterator<T>::type inline BOOST_DEDUCED_TYPENAME range_const_iterator<T>::type
const_begin( const T& r ) const_begin( const T& r )
{ {
return boost::begin( r ); return begin( r );
} }
} }

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

@ -183,7 +183,7 @@ namespace boost
inline BOOST_DEDUCED_TYPENAME range_const_iterator<T>::type inline BOOST_DEDUCED_TYPENAME range_const_iterator<T>::type
const_end( const T& r ) const_end( const T& r )
{ {
return boost::end( r ); return end( r );
} }
} }

83
include/boost/range/iterator_range.hpp
View File

@ -44,42 +44,17 @@ namespace boost
{ {
namespace iterator_range_detail namespace iterator_range_detail
{ {
template< class Left, class Right >
inline bool equal( const Left& l, const Right& r )
{
typedef BOOST_DEDUCED_TYPENAME boost::range_size<Left>::type sz_type;
sz_type l_size = boost::size( l ),
r_size = boost::size( r );
if( l_size != r_size )
return false;
return std::equal( boost::begin(l), boost::end(l),
boost::begin(r) );
}
template< class Left, class Right >
inline bool less_than( const Left& l, const Right& r )
{
return std::lexicographical_compare( boost::begin(l),
boost::end(l),
boost::begin(r),
boost::end(r) );
}
//
// To be deleted...
// //
// The functions adl_begin and adl_end are implemented in a separate // The functions adl_begin and adl_end are implemented in a separate
// class for gcc-2.9x // class for gcc-2.9x
//
template<typename IteratorT> template<typename IteratorT>
struct iterator_range_impl { struct iterator_range_impl {
template< class ForwardRange > template< class ForwardRange >
static IteratorT adl_begin( ForwardRange& r ) static IteratorT adl_begin( ForwardRange& r )
{ {
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
return boost::begin( r ); return begin( r );
#else #else
using boost::begin; using boost::begin;
return IteratorT( begin( r ) ); return IteratorT( begin( r ) );
@ -90,7 +65,7 @@ namespace boost
static IteratorT adl_end( ForwardRange& r ) static IteratorT adl_end( ForwardRange& r )
{ {
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
return boost::end( r ); return end( r );
#else #else
using boost::end; using boost::end;
return IteratorT( end( r ) ); return IteratorT( end( r ) );
@ -98,6 +73,30 @@ namespace boost
} }
}; };
template< class Left, class Right >
inline bool equal( const Left& l, const Right& r )
{
typedef BOOST_DEDUCED_TYPENAME boost::range_size<Left>::type sz_type;
sz_type l_size = size( l ),
r_size = size( r );
if( l_size != r_size )
return false;
return std::equal( begin(l), end(l),
begin(r) );
}
template< class Left, class Right >
inline bool less_than( const Left& l, const Right& r )
{
return std::lexicographical_compare( begin(l),
end(l),
begin(r),
end(r) );
}
struct range_tag { }; struct range_tag { };
struct const_range_tag { }; struct const_range_tag { };
@ -165,25 +164,25 @@ namespace boost
//! Constructor from a Range //! Constructor from a Range
template< class Range > template< class Range >
iterator_range( const Range& r ) : iterator_range( const Range& r ) :
m_Begin( boost::begin( r ) ), m_End( boost::end( r ) ), m_Begin( impl::adl_begin( r ) ), m_End( impl::adl_end( r ) ),
singular(false) {} singular(false) {}
//! Constructor from a Range //! Constructor from a Range
template< class Range > template< class Range >
iterator_range( Range& r ) : iterator_range( Range& r ) :
m_Begin( boost::begin( r ) ), m_End( boost::end( r ) ), m_Begin( impl::adl_begin( r ) ), m_End( impl::adl_end( r ) ),
singular(false) {} singular(false) {}
//! Constructor from a Range //! Constructor from a Range
template< class Range > template< class Range >
iterator_range( const Range& r, iterator_range_detail::const_range_tag ) : iterator_range( const Range& r, iterator_range_detail::const_range_tag ) :
m_Begin( boost::begin( r ) ), m_End( boost::end( r ) ), m_Begin( impl::adl_begin( r ) ), m_End( impl::adl_end( r ) ),
singular(false) {} singular(false) {}
//! Constructor from a Range //! Constructor from a Range
template< class Range > template< class Range >
iterator_range( Range& r, iterator_range_detail::range_tag ) : iterator_range( Range& r, iterator_range_detail::range_tag ) :
m_Begin( boost::begin( r ) ), m_End( boost::end( r ) ), m_Begin( impl::adl_begin( r ) ), m_End( impl::adl_end( r ) ),
singular(false) {} singular(false) {}
template< class Iterator > template< class Iterator >
@ -201,8 +200,8 @@ namespace boost
template< class ForwardRange > template< class ForwardRange >
iterator_range& operator=( ForwardRange& r ) iterator_range& operator=( ForwardRange& r )
{ {
m_Begin = boost::begin( r ); m_Begin = impl::adl_begin( r );
m_End = boost::end( r ); m_End = impl::adl_end( r );
singular = false; singular = false;
return *this; return *this;
} }
@ -210,8 +209,8 @@ namespace boost
template< class ForwardRange > template< class ForwardRange >
iterator_range& operator=( const ForwardRange& r ) iterator_range& operator=( const ForwardRange& r )
{ {
m_Begin = boost::begin( r ); m_Begin = impl::adl_begin( r );
m_End = boost::end( r ); m_End = impl::adl_end( r );
singular = false; singular = false;
return *this; return *this;
} }
@ -328,7 +327,7 @@ namespace boost
std::basic_ostream<Elem, Traits>& Os, std::basic_ostream<Elem, Traits>& Os,
const iterator_range<IteratorT>& r ) const iterator_range<IteratorT>& r )
{ {
std::copy( boost::begin(r), boost::end(r), std::ostream_iterator<Elem>(Os)); std::copy( r.begin(), r.end(), std::ostream_iterator<Elem>(Os));
return Os; return Os;
} }
@ -344,7 +343,7 @@ namespace boost
std::ostream& Os, std::ostream& Os,
const iterator_range<IteratorT>& r ) const iterator_range<IteratorT>& r )
{ {
std::copy( boost::begin(r), boost::end(r), std::ostream_iterator<char>(Os)); std::copy( r.begin(), r.end(), std::ostream_iterator<char>(Os));
return Os; return Os;
} }
@ -447,7 +446,7 @@ namespace boost
make_iterator_range( Range& r ) make_iterator_range( Range& r )
{ {
return iterator_range< BOOST_DEDUCED_TYPENAME range_result_iterator<Range>::type > return iterator_range< BOOST_DEDUCED_TYPENAME range_result_iterator<Range>::type >
( boost::begin( r ), boost::end( r ) ); ( begin( r ), end( r ) );
} }
#else #else
@ -486,8 +485,8 @@ namespace boost
return make_iterator_range( r ); return make_iterator_range( r );
BOOST_DEDUCED_TYPENAME range_result_iterator<Range>::type BOOST_DEDUCED_TYPENAME range_result_iterator<Range>::type
new_begin = boost::begin( r ), new_begin = begin( r ),
new_end = boost::end( r ); new_end = end( r );
std::advance( new_begin, advance_begin ); std::advance( new_begin, advance_begin );
std::advance( new_end, advance_end ); std::advance( new_end, advance_end );
return make_iterator_range( new_begin, new_end ); return make_iterator_range( new_begin, new_end );
@ -541,7 +540,7 @@ namespace boost
template< typename SeqT, typename Range > template< typename SeqT, typename Range >
inline SeqT copy_range( const Range& r ) inline SeqT copy_range( const Range& r )
{ {
return SeqT( boost::begin( r ), boost::end( r ) ); return SeqT( begin( r ), end( r ) );
} }
} // namespace 'boost' } // namespace 'boost'

4
include/boost/range/sub_range.hpp
View File

@ -44,7 +44,7 @@ namespace boost
sub_range( ForwardRange2& r ) : sub_range( ForwardRange2& r ) :
#if BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 800 ) #if BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 800 )
base( boost::begin( r ), boost::end( r ) ) base( impl::adl_begin( r ), impl::adl_end( r ) )
#else #else
base( r ) base( r )
#endif #endif
@ -54,7 +54,7 @@ namespace boost
sub_range( const ForwardRange2& r ) : sub_range( const ForwardRange2& r ) :
#if BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 800 ) #if BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 800 )
base( boost::begin( r ), boost::end( r ) ) base( impl::adl_begin( r ), impl::adl_end( r ) )
#else #else
base( r ) base( r )
#endif #endif