feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
morinmorin
2015-08-21 21:40:25 +09:00
parent 7fad9837fb
commit 490ba3fdcd
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/range/detail/join_iterator.hpp
View File

@@ -153,8 +153,12 @@ template<typename Iterator1
typename iterator_reference<Iterator2>::type typename iterator_reference<Iterator2>::type
>::type >::type
>::value, >::value,
typename add_const< typename add_reference<
typename iterator_reference<Iterator1>::type typename add_const<
typename remove_reference<
typename iterator_reference<Iterator1>::type
>::type
>::type
>::type, >::type,
typename iterator_reference<Iterator1>::type typename iterator_reference<Iterator1>::type
>::type >::type

1
test/join.cpp
View File

@@ -277,6 +277,7 @@ namespace boost
std::vector<int> v2; std::vector<int> v2;
std::vector<int> joined; std::vector<int> joined;
boost::push_back(joined, join(v1, v2)); boost::push_back(joined, join(v1, v2));
boost::push_back(joined, join(v2, v1));
} }
namespace trac7376 namespace trac7376