Qualify call to boost::size to avoid ambiguity with std::size

Don't assume that because type `T` is a range that `const T` is also a range.

doc/Jamfile.v2

@@ -28,3 +28,8 @@ boostbook quickbook
     <format>pdf:<xsl:param>img.src.path=$(images_location)/
   ;
 
+###############################################################################
+alias boostdoc ;
+explicit boostdoc ;
+alias boostrelease : quickbook ;
+explicit boostrelease ;

include/boost/range/const_iterator.hpp

@@ -36,7 +36,7 @@ namespace boost
 BOOST_RANGE_EXTRACT_OPTIONAL_TYPE( const_iterator )
 
 template< typename C >
-struct range_const_iterator
+struct range_const_iterator_helper
         : extract_const_iterator<C>
 {};
 
@@ -45,7 +45,7 @@ struct range_const_iterator
 //////////////////////////////////////////////////////////////////////////
 
 template< typename Iterator >
-struct range_const_iterator<std::pair<Iterator,Iterator> >
+struct range_const_iterator_helper<std::pair<Iterator,Iterator> >
 {
     typedef Iterator type;
 };
@@ -55,7 +55,7 @@ struct range_const_iterator<std::pair<Iterator,Iterator> >
 //////////////////////////////////////////////////////////////////////////
 
 template< typename T, std::size_t sz >
-struct range_const_iterator< T[sz] >
+struct range_const_iterator_helper< T[sz] >
 {
     typedef const T* type;
 };
@@ -64,7 +64,7 @@ struct range_const_iterator< T[sz] >
 
 template<typename C, typename Enabler=void>
 struct range_const_iterator
-        : range_detail::range_const_iterator<
+        : range_detail::range_const_iterator_helper<
             BOOST_DEDUCED_TYPENAME remove_reference<C>::type
         >
 {

include/boost/range/detail/any_iterator.hpp

@@ -247,9 +247,8 @@ namespace boost
             any_iterator_type stored_iterator;
         };
 
-
-    }
-    }
+    } //namespace detail
+    } //namespace iterators
 
     namespace range_detail
     {

include/boost/range/size_type.hpp

@@ -83,11 +83,6 @@ namespace boost
         detail::range_size<T>
     { };
 
-    template< class T >
-    struct range_size<const T > :
-        detail::range_size<T>
-    { };
-
 } // namespace boost
 
 

test/iterator_range.cpp

@@ -59,8 +59,8 @@ void check_iterator_range()
         BOOST_CHECK( false );
 //#endif
 
-    BOOST_CHECK_EQUAL( r.size(), size( r ) );
-    BOOST_CHECK_EQUAL( r2.size(), size( r2 ) );
+    BOOST_CHECK_EQUAL( r.size(), boost::size( r ) );
+    BOOST_CHECK_EQUAL( r2.size(), boost::size( r2 ) );
 
     BOOST_CHECK_EQUAL( std::distance( r.begin(), r.end() ),
                        std::distance( boost::begin( r2 ), boost::end( r2 ) ) );
@@ -280,23 +280,6 @@ void test_sfinae()
     boost::iterator_range<ptr_iterator> r(ptr_iterator(0), ptr_iterator(0));
 }
 
-boost::unit_test::test_suite* init_unit_test_suite( int argc, char* argv[] )
-{
-    boost::unit_test::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite" );
-
-    test->add(BOOST_TEST_CASE(&check_iterator_range));
-    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::less>));
-    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::less_or_equal>));
-    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::greater>));
-    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::greater_or_equal>));
-    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::equal_to>));
-    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::not_equal_to>));
-    test->add(BOOST_TEST_CASE(&iterator_range_test_detail::check_make_iterator_range_n));
-    test->add(BOOST_TEST_CASE(&test_advance));
-
-    return test;
-}
-
 //
 //
 // Check that constness is propagated correct from
@@ -327,3 +310,21 @@ void check_reference_type()
     test_iter_range<veci_type>(a_vec);
     test_iter_range<veci_type const>(a_vec);
 }
+
+boost::unit_test::test_suite* init_unit_test_suite( int argc, char* argv[] )
+{
+    boost::unit_test::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite" );
+    
+    test->add(BOOST_TEST_CASE(&check_iterator_range));
+    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::less>));
+    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::less_or_equal>));
+    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::greater>));
+    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::greater_or_equal>));
+    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::equal_to>));
+    test->add(BOOST_TEST_CASE(&check_iterator_range_operator<iterator_range_test_detail::not_equal_to>));
+    test->add(BOOST_TEST_CASE(&iterator_range_test_detail::check_make_iterator_range_n));
+    test->add(BOOST_TEST_CASE(&test_advance));
+    
+    return test;
+}
+