Index: range/join.hpp =================================================================== --- range/join.hpp (revision 81326) +++ range/join.hpp (working copy) @@ -26,7 +26,7 @@ { public: typedef iterator_range< - range_detail::join_iterator< + join_iterator< BOOST_DEDUCED_TYPENAME range_iterator::type, BOOST_DEDUCED_TYPENAME range_iterator::type, BOOST_DEDUCED_TYPENAME range_value::type @@ -41,21 +41,21 @@ template class joined_range - : public range_detail::joined_type::type + : public boost::range_detail::joined_type::type { - typedef range_detail::join_iterator< + typedef boost::range_detail::join_iterator< BOOST_DEDUCED_TYPENAME range_iterator::type, BOOST_DEDUCED_TYPENAME range_iterator::type, BOOST_DEDUCED_TYPENAME range_value::type > iterator_t; - typedef BOOST_DEDUCED_TYPENAME range_detail::joined_type< + typedef BOOST_DEDUCED_TYPENAME boost::range_detail::joined_type< SinglePassRange1, SinglePassRange2>::type base_t; public: joined_range(SinglePassRange1& rng1, SinglePassRange2& rng2) : base_t( - iterator_t(rng1, rng2, range_detail::join_iterator_begin_tag()), - iterator_t(rng1, rng2, range_detail::join_iterator_end_tag()) + iterator_t(rng1, rng2, boost::range_detail::join_iterator_begin_tag()), + iterator_t(rng1, rng2, boost::range_detail::join_iterator_end_tag()) ) { }