From 490ba3fdcdf37badba2913075d9390d80282b1ee Mon Sep 17 00:00:00 2001
From: morinmorin <mimomorin@gmail.com>
Date: Fri, 21 Aug 2015 21:40:25 +0900
Subject: [PATCH] Reapply r85400 (this time use Iterator1 instead of Iterator2
 as per r85691) and enhance the testcase; fixes ticket 11563.

---
 include/boost/range/detail/join_iterator.hpp | 8 ++++++--
 test/join.cpp                                | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/boost/range/detail/join_iterator.hpp b/include/boost/range/detail/join_iterator.hpp
index 1020ebf..0f47f58 100644
--- 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
diff --git a/test/join.cpp b/test/join.cpp
index 586f05c..300028b 100644
--- 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