From 4de4fbc46e7f4812d4538d9e9378873576261993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20J=C3=B8rgen=20Ottosen?= Date: Fri, 20 Aug 2004 19:26:34 +0000 Subject: [PATCH] *** empty log message *** [SVN r24622] --- include/boost/range/empty.hpp | 2 +- include/boost/range/size.hpp | 4 ++-- test/iterator_range.cpp | 9 ++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/boost/range/empty.hpp b/include/boost/range/empty.hpp index f23e980..77abb0c 100755 --- a/include/boost/range/empty.hpp +++ b/include/boost/range/empty.hpp @@ -35,7 +35,7 @@ namespace range_detail template< typename C > inline bool empty( const C& c ) { - return begin( c ) == end( c ); + return boost::begin( c ) == boost::end( c ); } ////////////////////////////////////////////////////////////////////// diff --git a/include/boost/range/size.hpp b/include/boost/range/size.hpp index 6e91802..34203b8 100755 --- a/include/boost/range/size.hpp +++ b/include/boost/range/size.hpp @@ -37,7 +37,7 @@ namespace range_detail ////////////////////////////////////////////////////////////////////// template< typename C > - inline BOOST_RANGE_DEDUCED_TYPENAME C::size_type + inline BOOST_DEDUCED_TYPENAME C::size_type size( const C& c ) { return c.size(); @@ -83,7 +83,7 @@ namespace range_detail return range_detail::str_size( s ); } -} // namespace 'range' +} // namespace 'range_detail' template< class T > inline BOOST_DEDUCED_TYPENAME range_size::type size( const T& r ) diff --git a/test/iterator_range.cpp b/test/iterator_range.cpp index 1e976e9..f285b87 100755 --- a/test/iterator_range.cpp +++ b/test/iterator_range.cpp @@ -57,11 +57,18 @@ void check_iterator_range() BOOST_CHECK( !r.empty() ); BOOST_CHECK( !r2.empty() ); - + +#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) + if( !(bool)r ) + BOOST_CHECK( false ); + if( !(bool)r2 ) + BOOST_CHECK( false ); +#else if( !r ) BOOST_CHECK( false ); if( !r2 ) BOOST_CHECK( false ); +#endif BOOST_CHECK_EQUAL( r.size(), size( r ) ); BOOST_CHECK_EQUAL( r2.size(), size( r2 ) );