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

Merge pull request #47 from boostorg/fix-boost-size_type
Don't assume that because type `T` is a range that `const T` is also a range.
2016-11-26 22:44:31 -08:00 · 2016-11-23 14:54:26 -08:00 · 2016-10-10 11:39:52 -05:00 · 2016-01-04 16:37:18 +00:00 · 2015-08-12 15:32:31 +02:00
4 changed files with 11 additions and 11 deletions
--- a/doc/Jamfile.v2
+++ b/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 ;
--- a/include/boost/range/const_iterator.hpp
+++ b/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
        >
 {
--- a/include/boost/range/size_type.hpp
+++ b/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


--- a/test/iterator_range.cpp
+++ b/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 ) ) );
Author	SHA1	Message	Date
Eric Niebler	56d470635d	Qualify call to boost::size to avoid ambiguity with std::size	2016-11-26 22:44:31 -08:00
Eric Niebler	f829c55c72	Merge pull request #47 from boostorg/fix-boost-size_type Don't assume that because type `T` is a range that `const T` is also a range.	2016-11-23 14:54:26 -08:00
Rene Rivera	7567dce0c1	Add, and update, documentation build targets.	2016-10-10 11:39:52 -05:00
neilgroves	0e931f4a80	Merge pull request #33 from tobias-loew/master Ticket #10397 - compilation error with mfc-iteratior-support: ambiguous symbol	2016-01-04 16:37:18 +00:00
tobias-loew	4f66482414	Ticket #10397 - compilation error with mfc-iteratior-support: ambiguous symbol fixed compilation error for mfc-iteration-support changed boost::range_detail::range_const_iterator to boost::range_detail::range_const_iterator_helper to address compilation error when using mfc-iteration-support	2015-08-12 15:32:31 +02:00