Ticket #7222: boost_1_50_0_fix_range_join.patch

File boost_1_50_0_fix_range_join.patch, 1.5 KB (added by Kolja Nowak <kolja@…>, 10 years ago)

Fix for boost/range/join.hpp

  • boost/range/join.hpp 

    diff -dur boost_1_50_0/boost/range/join.hpp boost_1_50_0_fix_range_join/boost/range/join.hpp
    old new  
    4141
    4242template<class SinglePassRange1, class SinglePassRange2>
    4343class joined_range
    44     : public range_detail::joined_type<SinglePassRange1, SinglePassRange2>::type
     44    : public ::boost::range_detail::joined_type<SinglePassRange1, SinglePassRange2>::type
    4545{
    46     typedef range_detail::join_iterator<
     46    typedef ::boost::range_detail::join_iterator<
    4747        BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange1>::type,
    4848        BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange2>::type,
    4949        BOOST_DEDUCED_TYPENAME range_value<SinglePassRange1>::type
    5050        > iterator_t;
    5151
    52     typedef BOOST_DEDUCED_TYPENAME range_detail::joined_type<
     52    typedef BOOST_DEDUCED_TYPENAME ::boost::range_detail::joined_type<
    5353                    SinglePassRange1, SinglePassRange2>::type base_t;
    5454public:
    5555    joined_range(SinglePassRange1& rng1, SinglePassRange2& rng2)
    5656        : 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())
    5959        )
    6060    {
    6161    }