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

fixes for gcc-2.9x: support for 'old' iostreams; moved adl_begin and adl_end into separate class

Browse Source 
[SVN r27278]
This commit is contained in:
Jonathan Turkanis
2005-02-09 17:26:18 +00:00
parent 1451d487e1
commit 64cd26106a
1 changed files with 91 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,13 @@
#ifndef BOOST_RANGE_ITERATOR_RANGE_HPP
#define BOOST_RANGE_ITERATOR_RANGE_HPP
#include <boost/config.hpp> // Define __STL_CONFIG_H, if appropriate.
#ifndef BOOST_OLD_IOSTREAMS // From boost/dynamic_bitset.hpp.
# if defined(__STL_CONFIG_H) && !defined (__STL_USE_NEW_IOSTREAMS)
# define BOOST_OLD_IOSTREAMS
# endif
#endif // #ifndef BOOST_OLD_IOSTREAMS
#include <boost/range/functions.hpp>
#include <boost/range/result_iterator.hpp>
#include <boost/range/difference_type.hpp>
@ -18,7 +25,11 @@
#include <boost/assert.hpp>
#include <iterator>
#include <algorithm>
#include <ostream>
#ifndef BOOST_OLD_IOSTREAMS
# include <ostream>
#else
# include <ostream.h>
#endif
#include <cstddef>
@ -56,6 +67,37 @@ namespace boost
begin(r),
end(r) );
}
// The functions adl_begin and adl_end are implemented in a separate
// class for gcc-2.9x
template<typename IteratorT>
struct iterator_range_impl {
template< class ForwardRange >
static IteratorT adl_begin( ForwardRange& r )
{
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
return boost::begin( r );
#else
using boost::begin;
return IteratorT( begin( r ) );
#endif
}
template< class ForwardRange >
static IteratorT adl_end( ForwardRange& r )
{
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
return boost::end( r );
#else
using boost::end;
return IteratorT( end( r ) );
#endif
}
};
struct range_tag { };
struct const_range_tag { };
}
// iterator range template class -----------------------------------------//
@ -80,7 +122,11 @@ namespace boost
template<typename IteratorT>
class iterator_range
{
protected: // Used by sub_range
//! implementation class
typedef iterator_range_detail::iterator_range_impl<IteratorT> impl;
public:
//! this type
typedef iterator_range<IteratorT> type;
//BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(value_type);
@ -116,13 +162,25 @@ namespace boost
//! Constructor from a Range
template< class Range >
iterator_range( const Range& r ) :
m_Begin( adl_begin( r ) ), m_End( adl_end( r ) ),
m_Begin( impl::adl_begin( r ) ), m_End( impl::adl_end( r ) ),
singular(false) {}
//! Constructor from a Range
template< class Range >
iterator_range( Range& r ) :
m_Begin( adl_begin( r ) ), m_End( adl_end( r ) ),
m_Begin( impl::adl_begin( r ) ), m_End( impl::adl_end( r ) ),
singular(false) {}
//! Constructor from a Range
template< class Range >
iterator_range( const Range& r, iterator_range_detail::const_range_tag ) :
m_Begin( impl::adl_begin( r ) ), m_End( impl::adl_end( r ) ),
singular(false) {}
//! Constructor from a Range
template< class Range >
iterator_range( Range& r, iterator_range_detail::range_tag ) :
m_Begin( impl::adl_begin( r ) ), m_End( impl::adl_end( r ) ),
singular(false) {}
template< class Iterator >
@ -140,8 +198,8 @@ namespace boost
template< class ForwardRange >
iterator_range& operator=( ForwardRange& r )
{
m_Begin = adl_begin( r );
m_End = adl_end( r );
m_Begin = impl::adl_begin( r );
m_End = impl::adl_end( r );
singular = false;
return *this;
}
@ -149,8 +207,8 @@ namespace boost
template< class ForwardRange >
iterator_range& operator=( const ForwardRange& r )
{
m_Begin = adl_begin( r );
m_End = adl_end( r );
m_Begin = impl::adl_begin( r );
m_End = impl::adl_end( r );
singular = false;
return *this;
}
@ -233,29 +291,6 @@ namespace boost
return m_Begin[sz];
}
protected:
template< class ForwardRange >
iterator adl_begin( ForwardRange& r )
{
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
return boost::begin( r );
#else
using boost::begin;
return iterator( begin( r ) );
#endif
}
template< class ForwardRange >
iterator adl_end( ForwardRange& r )
{
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
return boost::end( r );
#else
using boost::end;
return iterator( end( r ) );
#endif
}
private:
// begin and end iterators
IteratorT m_Begin;
@ -278,6 +313,8 @@ namespace boost
}
#endif
#ifndef BOOST_OLD_IOSTREAMS
//! iterator_range output operator
/*!
Output the range to an ostream. Elements are outputed
@ -292,6 +329,24 @@ namespace boost
return Os;
}
#else
//! iterator_range output operator
/*!
Output the range to an ostream. Elements are outputed
in a sequence without separators.
*/
template< typename IteratorT >
inline std::ostream& operator<<(
std::ostream& Os,
const iterator_range<IteratorT>& r )
{
std::copy( begin(r), end(r), std::ostream_iterator<char>(Os));
return Os;
}
#endif
/////////////////////////////////////////////////////////////////////
// comparison operators
/////////////////////////////////////////////////////////////////////
@ -402,16 +457,16 @@ namespace boost
inline iterator_range< BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type >
make_iterator_range( ForwardRange& r )
{
return iterator_range< BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type >
( r );
return iterator_range< BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type >
( r, iterator_range_detail::range_tag() );
}
template< class ForwardRange >
inline iterator_range< BOOST_DEDUCED_TYPENAME range_const_iterator<ForwardRange>::type >
make_iterator_range( const ForwardRange& r )
{
return iterator_range< BOOST_DEDUCED_TYPENAME range_const_iterator<ForwardRange>::type >
( r );
return iterator_range< BOOST_DEDUCED_TYPENAME range_const_iterator<ForwardRange>::type >
( r, iterator_range_detail::const_range_tag() );
}
#endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
@ -505,5 +560,6 @@ namespace boost
} // namespace 'boost'
#undef BOOST_OLD_IOSTREAMS
#endif