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

[boost][range] - changed join_iterator reference type handling to address several user observations and failing clang builds.

Browse Source 
[SVN r85691]
This commit is contained in:
Neil Groves
2013-09-15 22:15:12 +00:00
parent f662a07bcc
commit 426e0c39a8
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,10 @@
#include <boost/range/empty.hpp> #include <boost/range/empty.hpp>
#include <boost/range/detail/demote_iterator_traversal_tag.hpp> #include <boost/range/detail/demote_iterator_traversal_tag.hpp>
#include <boost/range/value_type.hpp> #include <boost/range/value_type.hpp>
#include <boost/type_traits/add_const.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/remove_const.hpp>
#include <boost/type_traits/remove_reference.hpp>
#include <boost/next_prior.hpp> #include <boost/next_prior.hpp>
namespace boost namespace boost
@ -71,7 +75,9 @@ public:
Reference dereference(unsigned int selected) const Reference dereference(unsigned int selected) const
{ {
return selected ? *m_it2 : *m_it1; if (selected)
return *m_it2;
return *m_it1;
} }
bool equal(const join_iterator_union& other, unsigned int selected) const bool equal(const join_iterator_union& other, unsigned int selected) const
@ -143,12 +149,8 @@ template<typename Iterator1
typename iterator_reference<Iterator2>::type typename iterator_reference<Iterator2>::type
>::type >::type
>::value, >::value,
typename add_reference< typename add_const<
typename add_const< typename iterator_reference<Iterator1>::type
typename remove_reference<
typename iterator_reference<Iterator2>::type
>::type
>::type
>::type, >::type,
typename iterator_reference<Iterator1>::type typename iterator_reference<Iterator1>::type
>::type >::type