From 39d77206e1fba0a0f7785e05c52bf92fbcb99a22 Mon Sep 17 00:00:00 2001 From: Neil Groves Date: Sat, 3 Apr 2010 19:31:43 +0000 Subject: [PATCH] Boost.Range fixed C++0x problem due to accidental argument dependent lookup in the const_ranges unit test. [SVN r61025] --- test/const_ranges.cpp | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) mode change 100755 => 100644 test/const_ranges.cpp diff --git a/test/const_ranges.cpp b/test/const_ranges.cpp old mode 100755 new mode 100644 index 6360317..cd0b06a --- a/test/const_ranges.cpp +++ b/test/const_ranges.cpp @@ -21,9 +21,6 @@ #include #include -using namespace boost; -using namespace std; - template< class T > const T& as_const( const T& r ) { @@ -33,27 +30,23 @@ const T& as_const( const T& r ) void check_const_ranges() { std::string foo( "foo" ); - const std::string bar( "bar" ); - - BOOST_CHECK( const_begin( foo ) == begin( as_const( foo ) ) ); - BOOST_CHECK( const_end( foo ) == end( as_const( foo ) ) ); - BOOST_CHECK( const_rbegin( foo ) == rbegin( as_const( foo ) ) ); - BOOST_CHECK( const_rend( foo ) == rend( as_const( foo ) ) ); + const std::string bar( "bar" ); - BOOST_CHECK( const_begin( bar ) == begin( as_const( bar ) ) ); - BOOST_CHECK( const_end( bar ) == end( as_const( bar ) ) ); - BOOST_CHECK( const_rbegin( bar ) == rbegin( as_const( bar ) ) ); - BOOST_CHECK( const_rend( bar ) == rend( as_const( bar ) ) ); + BOOST_CHECK( boost::const_begin( foo ) == boost::begin( as_const( foo ) ) ); + BOOST_CHECK( boost::const_end( foo ) == boost::end( as_const( foo ) ) ); + BOOST_CHECK( boost::const_rbegin( foo ) == boost::rbegin( as_const( foo ) ) ); + BOOST_CHECK( boost::const_rend( foo ) == boost::rend( as_const( foo ) ) ); + + BOOST_CHECK( boost::const_begin( bar ) == boost::begin( as_const( bar ) ) ); + BOOST_CHECK( boost::const_end( bar ) == boost::end( as_const( bar ) ) ); + BOOST_CHECK( boost::const_rbegin( bar ) == boost::rbegin( as_const( bar ) ) ); + BOOST_CHECK( boost::const_rend( bar ) == boost::rend( as_const( bar ) ) ); } - - -using boost::unit_test::test_suite; - -test_suite* init_unit_test_suite( int argc, char* argv[] ) +boost::unit_test::test_suite* init_unit_test_suite( int argc, char* argv[] ) { - test_suite* test = BOOST_TEST_SUITE( "Range Test Suite" ); + boost::unit_test::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite" ); test->add( BOOST_TEST_CASE( &check_const_ranges ) );