From 6f112526331d64c848dd2e858f477dad043fa419 Mon Sep 17 00:00:00 2001
From: Neil Groves <neilgroves@googlemail.com>
Date: Sat, 31 Jan 2015 14:50:58 +0000
Subject: [PATCH 1/8] Ticket 10336 - unit test added.

---
 test/Jamfile.v2       |  1 +
 test/ticket_10336.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 test/ticket_10336.cpp

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index dcc20c6..0fa1fa6 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -219,6 +219,7 @@ test-suite range :
     [ range-test ticket_5811_indirected_optional ]
     [ range-test ticket_6715_iterator_range_equality ]
     [ range-test ticket_6944 ]
+    [ range-test ticket_10336 ]
     [ range-test value_type ]
     ;
 
diff --git a/test/ticket_10336.cpp b/test/ticket_10336.cpp
new file mode 100644
index 0000000..541e037
--- /dev/null
+++ b/test/ticket_10336.cpp
@@ -0,0 +1,43 @@
+// Boost.Range library
+//
+//  Copyright Neil Groves 2011. Use, modification and
+//  distribution is subject to the Boost Software License, Version
+//  1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+//
+//
+// For more information, see http://www.boost.org/libs/range/
+//
+#include <boost/range/iterator_range.hpp>
+#include <boost/unordered_map.hpp>
+
+#include <boost/test/test_tools.hpp>
+#include <boost/test/unit_test.hpp>
+
+namespace boost
+{
+    namespace
+    {
+        // Ticket 10336 - compilation error in iterator_range and unordered_map
+        void test_ticket_10336()
+        {
+            typedef boost::unordered_map<int,int> container_t;
+            typedef container_t::const_iterator citer_t;
+            typedef boost::iterator_range<citer_t> rng_t;
+            
+            const container_t c;
+            rng_t rng(c.begin(), c.end());
+        }
+    }
+}
+
+boost::unit_test::test_suite*
+init_unit_test_suite(int argc, char* argv[])
+{
+    boost::unit_test::test_suite* test
+        = BOOST_TEST_SUITE( "RangeTestSuite.ticket_10336" );
+
+    test->add( BOOST_TEST_CASE( &boost::test_ticket_10336 ) );
+
+    return test;
+}

From 4a80ccd50d1348d602297c93d2f19fcf103a519d Mon Sep 17 00:00:00 2001
From: Neil Groves <neilgroves@gmail.com>
Date: Sun, 1 Feb 2015 19:05:58 +0000
Subject: [PATCH 2/8] Ticket 10988 - Filtered adaptor should only require
 SinglePassRange.

---
 doc/reference/adaptors/filtered.qbk           |  4 +-
 include/boost/range/adaptor/filtered.hpp      | 51 ++++++++++---------
 test/Jamfile.v2                               |  4 --
 test/adaptor_test/filtered.cpp                | 24 +++++++++
 .../compile_fail/adaptor/filtered_concept.cpp | 38 --------------
 .../adaptor/filtered_concept2.cpp             | 38 --------------
 .../adaptor/filtered_concept3.cpp             | 38 --------------
 .../adaptor/filtered_concept4.cpp             | 38 --------------
 8 files changed, 53 insertions(+), 182 deletions(-)
 delete mode 100644 test/compile_fail/adaptor/filtered_concept.cpp
 delete mode 100644 test/compile_fail/adaptor/filtered_concept2.cpp
 delete mode 100644 test/compile_fail/adaptor/filtered_concept3.cpp
 delete mode 100644 test/compile_fail/adaptor/filtered_concept4.cpp

diff --git a/doc/reference/adaptors/filtered.qbk b/doc/reference/adaptors/filtered.qbk
index 0340ed1..4ca3f91 100644
--- a/doc/reference/adaptors/filtered.qbk
+++ b/doc/reference/adaptors/filtered.qbk
@@ -12,9 +12,9 @@
 ]
 
 * [*Precondition:]  The `value_type` of the range is convertible to the argument type of `pred`.
-* [*Postcondition:] For all adjacent elements `[x]` in the returned range, `pred(x)` is `true`.
+* [*Postcondition:] For all elements `[x]` in the returned range, `pred(x)` is `true`.
 * [*Throws:] Whatever the copy constructor of `pred` might throw.
-* [*Range Category:] __forward_range__
+* [*Range Category:] __singlepass_range__
 * [*Range Return Type:] `boost::filtered_range<decltype(rng)>`
 * [*Returned Range Category:] The minimum of the range category of `rng` and __bidirectional_range__
 
diff --git a/include/boost/range/adaptor/filtered.hpp b/include/boost/range/adaptor/filtered.hpp
index b6d3ab1..1fb778e 100644
--- a/include/boost/range/adaptor/filtered.hpp
+++ b/include/boost/range/adaptor/filtered.hpp
@@ -56,23 +56,23 @@ namespace boost
             { }
         };
 
-        template< class ForwardRange, class Predicate >
-        inline filtered_range<Predicate, ForwardRange>
-        operator|(ForwardRange& r,
+        template< class SinglePassRange, class Predicate >
+        inline filtered_range<Predicate, SinglePassRange>
+        operator|(SinglePassRange& r,
                   const filter_holder<Predicate>& f)
         {
-            BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
-            return filtered_range<Predicate, ForwardRange>( f.val, r );
+            BOOST_RANGE_CONCEPT_ASSERT((SinglePassRangeConcept<SinglePassRange>));
+            return filtered_range<Predicate, SinglePassRange>( f.val, r );
         }
 
-        template< class ForwardRange, class Predicate >
-        inline filtered_range<Predicate, const ForwardRange>
-        operator|(const ForwardRange& r,
+        template< class SinglePassRange, class Predicate >
+        inline filtered_range<Predicate, const SinglePassRange>
+        operator|(const SinglePassRange& r,
                   const filter_holder<Predicate>& f )
         {
             BOOST_RANGE_CONCEPT_ASSERT((
-                ForwardRangeConcept<const ForwardRange>));
-            return filtered_range<Predicate, const ForwardRange>( f.val, r );
+                SinglePassRangeConcept<const SinglePassRange>));
+            return filtered_range<Predicate, const SinglePassRange>( f.val, r );
         }
 
     } // 'range_detail'
@@ -93,23 +93,26 @@ namespace boost
                        range_detail::forwarder<range_detail::filter_holder>();
         }
 
-        template<class ForwardRange, class Predicate>
-        inline filtered_range<Predicate, ForwardRange>
-        filter(ForwardRange& rng, Predicate filter_pred)
-        {
-            BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
-
-            return range_detail::filtered_range<Predicate, ForwardRange>( filter_pred, rng );
-        }
-
-        template<class ForwardRange, class Predicate>
-        inline filtered_range<Predicate, const ForwardRange>
-        filter(const ForwardRange& rng, Predicate filter_pred)
+        template<class SinglePassRange, class Predicate>
+        inline filtered_range<Predicate, SinglePassRange>
+        filter(SinglePassRange& rng, Predicate filter_pred)
         {
             BOOST_RANGE_CONCEPT_ASSERT((
-                ForwardRangeConcept<const ForwardRange>));
+                SinglePassRangeConcept<SinglePassRange>));
 
-            return range_detail::filtered_range<Predicate, const ForwardRange>( filter_pred, rng );
+            return range_detail::filtered_range<
+                Predicate, SinglePassRange>( filter_pred, rng );
+        }
+
+        template<class SinglePassRange, class Predicate>
+        inline filtered_range<Predicate, const SinglePassRange>
+        filter(const SinglePassRange& rng, Predicate filter_pred)
+        {
+            BOOST_RANGE_CONCEPT_ASSERT((
+                SinglePassRangeConcept<const SinglePassRange>));
+
+            return range_detail::filtered_range<
+                Predicate, const SinglePassRange>( filter_pred, rng );
         }
     } // 'adaptors'
 
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 0fa1fa6..05937c7 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -40,10 +40,6 @@ test-suite range :
     [ compile-fail compile_fail/adaptor/copied_concept2.cpp ]
     [ compile-fail compile_fail/adaptor/copied_concept3.cpp ]
     [ compile-fail compile_fail/adaptor/copied_concept4.cpp ]
-    [ compile-fail compile_fail/adaptor/filtered_concept.cpp ]
-    [ compile-fail compile_fail/adaptor/filtered_concept2.cpp ]
-    [ compile-fail compile_fail/adaptor/filtered_concept3.cpp ]
-    [ compile-fail compile_fail/adaptor/filtered_concept4.cpp ]
     [ compile-fail compile_fail/adaptor/reversed_concept.cpp ]
     [ compile-fail compile_fail/adaptor/reversed_concept2.cpp ]
     [ compile-fail compile_fail/adaptor/reversed_concept3.cpp ]
diff --git a/test/adaptor_test/filtered.cpp b/test/adaptor_test/filtered.cpp
index 8e7b958..17a457f 100644
--- a/test/adaptor_test/filtered.cpp
+++ b/test/adaptor_test/filtered.cpp
@@ -21,6 +21,7 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <sstream>
 
 namespace boost
 {
@@ -113,12 +114,35 @@ namespace boost
             filtered_test_impl< Container, is_even >();
         }
 
+        void ticket_10988_single_pass()
+        {
+            std::vector<int> v;
+            std::string str("0 1 2 3 4 5");
+            std::istringstream in(str);
+
+            boost::push_back(v,
+                boost::make_iterator_range(
+                    std::istream_iterator<int>(in),
+                    std::istream_iterator<int>())
+                | boost::adaptors::filtered(is_even()));
+
+            std::vector<int> reference;
+            for (int i = 0; i < 6; i += 2)
+            {
+                reference.push_back(i);
+            }
+            BOOST_CHECK_EQUAL_COLLECTIONS(
+                reference.begin(), reference.end(),
+                v.begin(), v.end());
+        }
+
         void filtered_test()
         {
             filtered_test_all_predicates< std::vector< int > >();
             filtered_test_all_predicates< std::list< int > >();
             filtered_test_all_predicates< std::set< int > >();
             filtered_test_all_predicates< std::multiset< int > >();
+            ticket_10988_single_pass();
         }
     }
 }
diff --git a/test/compile_fail/adaptor/filtered_concept.cpp b/test/compile_fail/adaptor/filtered_concept.cpp
deleted file mode 100644
index 4242d3c..0000000
--- a/test/compile_fail/adaptor/filtered_concept.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Boost.Range library
-//
-// Copyright Neil Groves 2014. Use, modification and distribution is subject
-// to the Boost Software License, Version 1.0. (See accompanying file
-// LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// For more information, see http://www.boost.org/libs/range
-//
-
-#include "mock_range.hpp"
-#include <boost/range/adaptor/filtered.hpp>
-
-namespace
-{
-
-struct always_true
-{
-    typedef bool result_type;
-
-    bool operator()(int) const
-    {
-        return true;
-    }
-};
-
-} // anonymous namespace
-
-int main(int, const char**)
-{
-    using boost::range::unit_test::mock_range;
-    using boost::adaptors::filtered;
-
-    // This next line should fail when Boost.Range concept checking is
-    // enabled since the filtered adaptor takes at least a ForwardRange.
-    return (mock_range<boost::single_pass_traversal_tag>() |
-                filtered(always_true())).front();
-}
diff --git a/test/compile_fail/adaptor/filtered_concept2.cpp b/test/compile_fail/adaptor/filtered_concept2.cpp
deleted file mode 100644
index d184eb0..0000000
--- a/test/compile_fail/adaptor/filtered_concept2.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Boost.Range library
-//
-// Copyright Neil Groves 2014. Use, modification and distribution is subject
-// to the Boost Software License, Version 1.0. (See accompanying file
-// LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// For more information, see http://www.boost.org/libs/range
-//
-
-#include "mock_range.hpp"
-#include <boost/range/adaptor/filtered.hpp>
-
-namespace
-{
-
-struct always_true
-{
-    typedef bool result_type;
-
-    bool operator()(int) const
-    {
-        return true;
-    }
-};
-
-} // anonymous namespace
-
-int main(int, const char**)
-{
-    using boost::range::unit_test::mock_const_range;
-    using boost::adaptors::filtered;
-
-    // This next line should fail when Boost.Range concept checking is
-    // enabled since the filtered adaptor takes at least a ForwardRange.
-    return (mock_const_range<boost::single_pass_traversal_tag>() |
-                filtered(always_true())).front();
-}
diff --git a/test/compile_fail/adaptor/filtered_concept3.cpp b/test/compile_fail/adaptor/filtered_concept3.cpp
deleted file mode 100644
index 6a30185..0000000
--- a/test/compile_fail/adaptor/filtered_concept3.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Boost.Range library
-//
-// Copyright Neil Groves 2014. Use, modification and distribution is subject
-// to the Boost Software License, Version 1.0. (See accompanying file
-// LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// For more information, see http://www.boost.org/libs/range
-//
-
-#include "mock_range.hpp"
-#include <boost/range/adaptor/filtered.hpp>
-
-namespace
-{
-
-struct always_true
-{
-    typedef bool result_type;
-
-    bool operator()(int) const
-    {
-        return true;
-    }
-};
-
-} // anonymous namespace
-
-int main(int, const char**)
-{
-    using boost::range::unit_test::mock_range;
-
-    // This next line should fail when Boost.Range concept checking is
-    // enabled since the filtered adaptor takes at least a ForwardRange.
-    return boost::adaptors::filter(
-        mock_range<boost::single_pass_traversal_tag>(),
-        always_true()).front();
-}
diff --git a/test/compile_fail/adaptor/filtered_concept4.cpp b/test/compile_fail/adaptor/filtered_concept4.cpp
deleted file mode 100644
index 8d21bba..0000000
--- a/test/compile_fail/adaptor/filtered_concept4.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Boost.Range library
-//
-// Copyright Neil Groves 2014. Use, modification and distribution is subject
-// to the Boost Software License, Version 1.0. (See accompanying file
-// LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// For more information, see http://www.boost.org/libs/range
-//
-
-#include "mock_range.hpp"
-#include <boost/range/adaptor/filtered.hpp>
-
-namespace
-{
-
-struct always_true
-{
-    typedef bool result_type;
-
-    bool operator()(int) const
-    {
-        return true;
-    }
-};
-
-} // anonymous namespace
-
-int main(int, const char**)
-{
-    using boost::range::unit_test::mock_const_range;
-
-    // This next line should fail when Boost.Range concept checking is
-    // enabled since the filtered adaptor takes at least a ForwardRange.
-    return boost::adaptors::filter(
-        mock_const_range<boost::single_pass_traversal_tag>(),
-        always_true()).front();
-}

From 435ca994bf334f2d60e755813bf941d2ff8db3c4 Mon Sep 17 00:00:00 2001
From: Neil Groves <neilgroves@gmail.com>
Date: Mon, 2 Feb 2015 20:17:04 +0000
Subject: [PATCH 3/8] Ticket 10989 - strided adapter category.

---
 include/boost/range/adaptor/strided.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/range/adaptor/strided.hpp b/include/boost/range/adaptor/strided.hpp
index c5fea86..560b820 100644
--- a/include/boost/range/adaptor/strided.hpp
+++ b/include/boost/range/adaptor/strided.hpp
@@ -603,7 +603,7 @@ namespace boost
         template<
             class Rng,
             class Category =
-                typename iterator_traversal<
+                typename iterators::pure_iterator_traversal<
                     typename range_iterator<Rng>::type
                 >::type
         >

From de206a64db39e069275564246415b1fc2aede49d Mon Sep 17 00:00:00 2001
From: Neil Groves <neilgroves@gmail.com>
Date: Mon, 2 Feb 2015 20:26:31 +0000
Subject: [PATCH 4/8] ticket10514 subrange unit test added.

---
 test/sub_range.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/sub_range.cpp b/test/sub_range.cpp
index be48811..a6dbb36 100644
--- a/test/sub_range.cpp
+++ b/test/sub_range.cpp
@@ -244,6 +244,22 @@ inline void test_advance()
     BOOST_CHECK_EQUAL(r3.advance_end(-1).size(), 1u);
 }
 
+void ticket_10514()
+{
+    typedef std::vector<int> vec_t;
+    typedef boost::sub_range<vec_t> range_t;
+    vec_t v(10);
+    range_t r(v.begin(), v.end());
+    const range_t& cr = r;
+    range_t copy_r = cr;
+
+    BOOST_CHECK(r.begin() == copy_r.begin());
+    BOOST_CHECK(r.end() == copy_r.end());
+
+    BOOST_CHECK(cr.begin() == copy_r.begin());
+    BOOST_CHECK(cr.end() == copy_r.end());
+}
+
     } // anonymous namespace
 } // namespace boost_range_test
 
@@ -262,6 +278,8 @@ boost::unit_test::test_suite* init_unit_test_suite(int, char*[])
 
     test->add(BOOST_TEST_CASE(&boost_range_test::test_advance));
 
+    test->add(BOOST_TEST_CASE(&boost_range_test::ticket_10514));
+
     return test;
 }
 

From 0b28fd043fec3e31535a328ffacc268b9ebb9ae9 Mon Sep 17 00:00:00 2001
From: Neil Groves <neilgroves@googlemail.com>
Date: Mon, 9 Feb 2015 01:21:16 +0000
Subject: [PATCH 5/8] Fix for MSVC subrange iterator conversions.

---
 include/boost/range/iterator_range_core.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/range/iterator_range_core.hpp b/include/boost/range/iterator_range_core.hpp
index 2fbeb68..a9e9fc0 100644
--- a/include/boost/range/iterator_range_core.hpp
+++ b/include/boost/range/iterator_range_core.hpp
@@ -66,13 +66,13 @@ namespace boost
             template< class ForwardRange >
             static IteratorT adl_begin( ForwardRange& r )
             {
-                return static_cast<IteratorT>( boost::begin( r ) );
+                return IteratorT( boost::begin( r ) );
             }
 
             template< class ForwardRange >
             static IteratorT adl_end( ForwardRange& r )
             {
-                return static_cast<IteratorT>( boost::end( r ) );
+                return IteratorT( boost::end( r ) );
             }
         };
 

From a53bd134b2f626cbf8639cc18b93a3f5610d2bab Mon Sep 17 00:00:00 2001
From: Edward Diener <eldiener@tropicsoft.com>
Date: Thu, 2 Apr 2015 01:54:45 -0400
Subject: [PATCH 6/8] Remove dependency on type traits ice_xxx.hpp headers,
 which are deprecated.

---
 include/boost/range/detail/common.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/boost/range/detail/common.hpp b/include/boost/range/detail/common.hpp
index b0ad535..00b665b 100644
--- a/include/boost/range/detail/common.hpp
+++ b/include/boost/range/detail/common.hpp
@@ -18,9 +18,10 @@
 #include <boost/range/config.hpp>
 #include <boost/range/detail/sfinae.hpp>
 #include <boost/type_traits/is_void.hpp>
-#include <boost/type_traits/detail/ice_or.hpp>
+#include <boost/mpl/bool.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/int.hpp>
+#include <boost/mpl/or.hpp>
 #include <cstddef>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -70,7 +71,7 @@ namespace boost
             BOOST_STATIC_CONSTANT( bool, is_const_wchar_t_ptr_   = sizeof( boost::range_detail::is_const_wchar_t_ptr_impl( ptr ) ) == sizeof( yes_type ) );
             BOOST_STATIC_CONSTANT( bool, is_char_array_          = sizeof( boost::range_detail::is_char_array_impl( ptr ) ) == sizeof( yes_type ) );
             BOOST_STATIC_CONSTANT( bool, is_wchar_t_array_       = sizeof( boost::range_detail::is_wchar_t_array_impl( ptr ) ) == sizeof( yes_type ) );
-            BOOST_STATIC_CONSTANT( bool, is_string_              = (boost::type_traits::ice_or<is_const_char_ptr_, is_const_wchar_t_ptr_>::value ));
+            BOOST_STATIC_CONSTANT( bool, is_string_              = (boost::mpl::or_<boost::mpl::bool_<is_const_char_ptr_>, boost::mpl::bool_<is_const_wchar_t_ptr_> >::value ));
             BOOST_STATIC_CONSTANT( bool, is_array_               = boost::is_array<C>::value );
             
         };

From 811b27141ae3aca840f093ed1f1b4c51f7752ccf Mon Sep 17 00:00:00 2001
From: Eric Niebler <eric@boostpro.com>
Date: Tue, 14 Apr 2015 00:57:54 -0700
Subject: [PATCH 7/8] make range_iterator, range_difference, and range_size
 SFINAE-friendly, refs #11187

---
 include/boost/range/difference_type.hpp | 27 +++++++++++++---
 include/boost/range/iterator.hpp        | 34 ++++++++++----------
 include/boost/range/size_type.hpp       | 42 +++++++++++++++----------
 3 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/include/boost/range/difference_type.hpp b/include/boost/range/difference_type.hpp
index afd8b07..a244908 100644
--- a/include/boost/range/difference_type.hpp
+++ b/include/boost/range/difference_type.hpp
@@ -15,20 +15,37 @@
 # pragma once
 #endif
 
+#include <boost/mpl/and.hpp>
 #include <boost/range/config.hpp>
 #include <boost/range/iterator.hpp>
+#include <boost/range/has_range_iterator.hpp>
 #include <boost/iterator/iterator_traits.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 
 namespace boost
 {
+    namespace range_detail
+    {
+        template< class T, class Enabler=void >
+        struct range_difference
+        { };
+
+        template< class T >
+        struct range_difference<
+            T,
+            BOOST_DEDUCED_TYPENAME ::boost::enable_if_c<
+                has_type<range_iterator<T> >::value
+            >::type
+        >
+          : iterator_difference<
+                BOOST_DEDUCED_TYPENAME range_iterator<T>::type
+            >
+        { };
+    }
+
     template< class T >
     struct range_difference
-            : iterator_difference<
-                BOOST_DEDUCED_TYPENAME range_iterator<
-                    BOOST_DEDUCED_TYPENAME remove_reference<T>::type
-                >::type
-            >
+      : range_detail::range_difference<BOOST_DEDUCED_TYPENAME remove_reference<T>::type>
     { };
 }
 
diff --git a/include/boost/range/iterator.hpp b/include/boost/range/iterator.hpp
index f15bf3b..2956353 100644
--- a/include/boost/range/iterator.hpp
+++ b/include/boost/range/iterator.hpp
@@ -46,31 +46,29 @@ namespace boost
        };       
     }  
     
-#endif  
-
     template< typename C, typename Enabler=void >
     struct range_iterator
     {
-#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
-  
+
         typedef BOOST_RANGE_DEDUCED_TYPENAME  
                range_detail_vc7_1::range_iterator<C>::type type;  
-           
-#else  
 
-    private:
-        typedef typename remove_reference<C>::type param_t;
-
-    public:
-        typedef typename mpl::eval_if_c<
-            is_const<param_t>::value,
-            range_const_iterator<typename remove_const<param_t>::type>,
-            range_mutable_iterator<param_t>
-        >::type type;
-        
-#endif         
     };
-    
+
+#else
+
+    template< typename C, typename Enabler=void >
+    struct range_iterator
+      : mpl::if_c<
+            is_const<typename remove_reference<C>::type>::value,
+            range_const_iterator<typename remove_const<typename remove_reference<C>::type>::type>,
+            range_mutable_iterator<typename remove_reference<C>::type>
+        >::type
+    {
+    };
+
+#endif
+
 } // namespace boost
 
 #endif
diff --git a/include/boost/range/size_type.hpp b/include/boost/range/size_type.hpp
index db5a59b..0b45f4c 100644
--- a/include/boost/range/size_type.hpp
+++ b/include/boost/range/size_type.hpp
@@ -18,6 +18,7 @@
 #include <boost/range/config.hpp>
 #include <boost/range/difference_type.hpp>
 #include <boost/range/concepts.hpp>
+#include <boost/range/has_range_iterator.hpp>
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/make_unsigned.hpp>
@@ -51,7 +52,7 @@ namespace boost
         };
 
         template<typename C, typename Enabler=void>
-        struct range_size
+        struct range_size_
         {
             typedef BOOST_DEDUCED_TYPENAME make_unsigned<
                 BOOST_DEDUCED_TYPENAME range_difference<C>::type
@@ -59,7 +60,7 @@ namespace boost
         };
 
         template<typename C>
-        struct range_size<
+        struct range_size_<
             C,
             BOOST_DEDUCED_TYPENAME ::boost::enable_if<has_size_type<C>, void>::type
         >
@@ -67,29 +68,38 @@ namespace boost
             typedef BOOST_DEDUCED_TYPENAME C::size_type type;
         };
 
-    }
+        template<typename C, typename Enabler=void>
+        struct range_size
+        { };
 
-    template< class T >
-    struct range_size :
-        detail::range_size<T>
-    {
+        template<typename C>
+        struct range_size<
+            C,
+            BOOST_DEDUCED_TYPENAME ::boost::enable_if_c<
+                range_detail::has_type< range_iterator<C> >::value
+            >::type
+        >
+          : range_size_<C>
+        {
 // Very strange things happen on some compilers that have the range concept
 // asserts disabled. This preprocessor condition is clearly redundant on a
 // working compiler but is vital for at least some compilers such as clang 4.2
 // but only on the Mac!
 #if BOOST_RANGE_ENABLE_CONCEPT_ASSERT == 1
-        BOOST_RANGE_CONCEPT_ASSERT((boost::SinglePassRangeConcept<T>));
+            BOOST_RANGE_CONCEPT_ASSERT((boost::SinglePassRangeConcept<C>));
 #endif
-    };
+        };
+    }
 
     template< class T >
-    struct range_size<const T >
-        : detail::range_size<T>
-    {
-#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT == 1        
-        BOOST_RANGE_CONCEPT_ASSERT((boost::SinglePassRangeConcept<T>));
-#endif
-    };
+    struct range_size :
+        detail::range_size<T>
+    { };
+
+    template< class T >
+    struct range_size<const T > :
+        detail::range_size<T>
+    { };
 
 } // namespace boost
 

From 3d5f3611ba796e5207b89d97877131ae6dea6840 Mon Sep 17 00:00:00 2001
From: Eric Niebler <eric@boostpro.com>
Date: Sat, 18 Apr 2015 11:42:38 -0700
Subject: [PATCH 8/8] fix build break on msvc-8.0

---
 include/boost/range/difference_type.hpp |  9 ++-------
 include/boost/range/size.hpp            |  9 +++++++++
 include/boost/range/size_type.hpp       | 19 +++----------------
 include/boost/range/sub_range.hpp       |  4 ++--
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/include/boost/range/difference_type.hpp b/include/boost/range/difference_type.hpp
index a244908..6bb3c5f 100644
--- a/include/boost/range/difference_type.hpp
+++ b/include/boost/range/difference_type.hpp
@@ -26,17 +26,12 @@ namespace boost
 {
     namespace range_detail
     {
-        template< class T, class Enabler=void >
+        template< class T, bool B = has_type<range_iterator<T> >::value >
         struct range_difference
         { };
 
         template< class T >
-        struct range_difference<
-            T,
-            BOOST_DEDUCED_TYPENAME ::boost::enable_if_c<
-                has_type<range_iterator<T> >::value
-            >::type
-        >
+        struct range_difference<T, true>
           : iterator_difference<
                 BOOST_DEDUCED_TYPENAME range_iterator<T>::type
             >
diff --git a/include/boost/range/size.hpp b/include/boost/range/size.hpp
index d007bfc..7f38db8 100644
--- a/include/boost/range/size.hpp
+++ b/include/boost/range/size.hpp
@@ -54,11 +54,20 @@ namespace boost
     inline typename range_size<const SinglePassRange>::type
     size(const SinglePassRange& rng)
     {
+// Very strange things happen on some compilers that have the range concept
+// asserts disabled. This preprocessor condition is clearly redundant on a
+// working compiler but is vital for at least some compilers such as clang 4.2
+// but only on the Mac!
+#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT == 1
+        BOOST_RANGE_CONCEPT_ASSERT((boost::SinglePassRangeConcept<SinglePassRange>));
+#endif
+
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
     !BOOST_WORKAROUND(__GNUC__, < 3) \
     /**/
         using namespace range_detail;
 #endif
+
         return range_calculate_size(rng);
     }
 
diff --git a/include/boost/range/size_type.hpp b/include/boost/range/size_type.hpp
index 0b45f4c..f41c321 100644
--- a/include/boost/range/size_type.hpp
+++ b/include/boost/range/size_type.hpp
@@ -68,27 +68,14 @@ namespace boost
             typedef BOOST_DEDUCED_TYPENAME C::size_type type;
         };
 
-        template<typename C, typename Enabler=void>
+        template<typename C, bool B = range_detail::has_type< range_iterator<C> >::value>
         struct range_size
         { };
 
         template<typename C>
-        struct range_size<
-            C,
-            BOOST_DEDUCED_TYPENAME ::boost::enable_if_c<
-                range_detail::has_type< range_iterator<C> >::value
-            >::type
-        >
+        struct range_size<C, true>
           : range_size_<C>
-        {
-// Very strange things happen on some compilers that have the range concept
-// asserts disabled. This preprocessor condition is clearly redundant on a
-// working compiler but is vital for at least some compilers such as clang 4.2
-// but only on the Mac!
-#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT == 1
-            BOOST_RANGE_CONCEPT_ASSERT((boost::SinglePassRangeConcept<C>));
-#endif
-        };
+        { };
     }
 
     template< class T >
diff --git a/include/boost/range/sub_range.hpp b/include/boost/range/sub_range.hpp
index 8d5d168..d1c3b99 100644
--- a/include/boost/range/sub_range.hpp
+++ b/include/boost/range/sub_range.hpp
@@ -182,8 +182,8 @@ public:
 
 #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500) ) 
         sub_range(const sub_range& r)
-            : base(impl::adl_begin(static_cast<const base&>(r)),
-                   impl::adl_end(static_cast<const base&>(r)))
+            : base(impl::adl_begin(const_cast<base&>(static_cast<const base&>(r))),
+                   impl::adl_end(const_cast<base&>(static_cast<const base&>(r))))
         { }  
 #endif