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

gcc-2.95 fix

Browse Source 
[SVN r29287]
This commit is contained in:
Jonathan Turkanis
2005-05-30 07:35:51 +00:00
parent f6b183140f
commit e5ddbb4bbc
2 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,65 +24,67 @@
#include <boost/range/iterator.hpp> #include <boost/range/iterator.hpp>
#include <boost/range/const_iterator.hpp> #include <boost/range/const_iterator.hpp>
namespace boost namespace boost
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
namespace range_detail !BOOST_WORKAROUND(__GNUC__, < 3) \
/**/
namespace range_detail
{ {
#endif #endif
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// primary template // primary template
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
template< typename C > template< typename C >
inline BOOST_DEDUCED_TYPENAME range_const_iterator<C>::type inline BOOST_DEDUCED_TYPENAME range_const_iterator<C>::type
boost_range_begin( const C& c ) boost_range_begin( const C& c )
{ {
return c.begin(); return c.begin();
} }
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 ) boost_range_begin( C& c )
{ {
return c.begin(); return c.begin();
} }
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// pair // pair
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
template< typename Iterator > template< typename Iterator >
inline Iterator boost_range_begin( const std::pair<Iterator,Iterator>& p ) inline Iterator boost_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 boost_range_begin( std::pair<Iterator,Iterator>& p )
{ {
return p.first; return p.first;
} }
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// array // array
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
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* boost_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* boost_range_begin( T (&array)[sz] )
{ {
return array; return array;
} }
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// string // string
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
@ -113,24 +115,26 @@ namespace range_detail
{ {
return s; return s;
} }
inline char* boost_range_begin( char*& s ) inline char* boost_range_begin( char*& s )
{ {
return s; return s;
} }
inline const wchar_t* boost_range_begin( const wchar_t*& s ) inline const wchar_t* boost_range_begin( const wchar_t*& s )
{ {
return s; return s;
} }
inline wchar_t* boost_range_begin( wchar_t*& s ) inline wchar_t* boost_range_begin( wchar_t*& s )
{ {
return s; return s;
} }
#endif #endif
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
!BOOST_WORKAROUND(__GNUC__, < 3) \
/**/
} // namespace 'range_detail' } // namespace 'range_detail'
#endif #endif
@ -138,18 +142,22 @@ namespace range_detail
template< class T > template< class T >
inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T& r ) inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T& r )
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
using namespace range_detail; !BOOST_WORKAROUND(__GNUC__, < 3) \
#endif /**/
using namespace range_detail;
#endif
return boost_range_begin( r ); return boost_range_begin( r );
} }
template< class T > template< class T >
inline BOOST_DEDUCED_TYPENAME range_const_iterator<T>::type begin( const T& r ) inline BOOST_DEDUCED_TYPENAME range_const_iterator<T>::type begin( const T& r )
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
using namespace range_detail; !BOOST_WORKAROUND(__GNUC__, < 3) \
#endif /**/
using namespace range_detail;
#endif
return boost_range_begin( r ); return boost_range_begin( r );
} }
@ -171,7 +179,7 @@ inline range_const_iterator<const wchar_t*>::type begin<const wchar_t*>( const w
} // namespace boost } // namespace boost
#endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING #endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
namespace boost namespace boost
{ {

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

@ -28,7 +28,9 @@
namespace boost namespace boost
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
!BOOST_WORKAROUND(__GNUC__, < 3) \
/**/
namespace range_detail namespace range_detail
{ {
#endif #endif
@ -130,14 +132,18 @@ namespace range_detail
} }
#endif #endif
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
!BOOST_WORKAROUND(__GNUC__, < 3) \
/**/
} // namespace 'range_detail' } // namespace 'range_detail'
#endif #endif
template< class T > template< class T >
inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r ) inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r )
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
!BOOST_WORKAROUND(__GNUC__, < 3) \
/**/
using namespace range_detail; using namespace range_detail;
#endif #endif
return boost_range_end( r ); return boost_range_end( r );
@ -146,7 +152,9 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r )
template< class T > template< class T >
inline BOOST_DEDUCED_TYPENAME range_const_iterator<T>::type end( const T& r ) inline BOOST_DEDUCED_TYPENAME range_const_iterator<T>::type end( const T& r )
{ {
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
!BOOST_WORKAROUND(__GNUC__, < 3) \
/**/
using namespace range_detail; using namespace range_detail;
#endif #endif
return boost_range_end( r ); return boost_range_end( r );