Ticket #7710: join.hpp.patch
File join.hpp.patch, 1.7 KB (added by , 10 years ago) |
---|
-
range/join.hpp
26 26 { 27 27 public: 28 28 typedef iterator_range< 29 range_detail::join_iterator<29 join_iterator< 30 30 BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange1>::type, 31 31 BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange2>::type, 32 32 BOOST_DEDUCED_TYPENAME range_value<SinglePassRange1>::type … … 41 41 42 42 template<class SinglePassRange1, class SinglePassRange2> 43 43 class joined_range 44 : public range_detail::joined_type<SinglePassRange1, SinglePassRange2>::type44 : public boost::range_detail::joined_type<SinglePassRange1, SinglePassRange2>::type 45 45 { 46 typedef range_detail::join_iterator<46 typedef boost::range_detail::join_iterator< 47 47 BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange1>::type, 48 48 BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange2>::type, 49 49 BOOST_DEDUCED_TYPENAME range_value<SinglePassRange1>::type 50 50 > iterator_t; 51 51 52 typedef BOOST_DEDUCED_TYPENAME range_detail::joined_type<52 typedef BOOST_DEDUCED_TYPENAME boost::range_detail::joined_type< 53 53 SinglePassRange1, SinglePassRange2>::type base_t; 54 54 public: 55 55 joined_range(SinglePassRange1& rng1, SinglePassRange2& rng2) 56 56 : base_t( 57 iterator_t(rng1, rng2, range_detail::join_iterator_begin_tag()),58 iterator_t(rng1, rng2, range_detail::join_iterator_end_tag())57 iterator_t(rng1, rng2, boost::range_detail::join_iterator_begin_tag()), 58 iterator_t(rng1, rng2, boost::range_detail::join_iterator_end_tag()) 59 59 ) 60 60 { 61 61 }