Reapply r85400 (this time use Iterator1 instead of Iterator2 as per r85691) and enhance the testcase; fixes ticket 11563.

2015-08-21 21:40:25 +09:00
parent 7fad9837fb
commit 490ba3fdcd
2 changed files with 7 additions and 2 deletions
--- a/include/boost/range/detail/join_iterator.hpp
+++ b/include/boost/range/detail/join_iterator.hpp
@ -153,8 +153,12 @@ template<typename Iterator1
                                    typename iterator_reference<Iterator2>::type
                                >::type
                            >::value,
-                            typename add_const<
-                                typename iterator_reference<Iterator1>::type
+                            typename add_reference<
+                                typename add_const<
+                                    typename remove_reference<
+                                        typename iterator_reference<Iterator1>::type
+                                    >::type
+                                >::type
                            >::type,
                            typename iterator_reference<Iterator1>::type
                        >::type
--- a/test/join.cpp
+++ b/test/join.cpp
@ -277,6 +277,7 @@ namespace boost
            std::vector<int> v2;
            std::vector<int> joined;
            boost::push_back(joined, join(v1, v2));
+            boost::push_back(joined, join(v2, v1));
        }

        namespace trac7376