Skip to content

Instantly share code, notes, and snippets.

@eiennohito
Created November 10, 2011 05:45
Show Gist options
  • Save eiennohito/1354201 to your computer and use it in GitHub Desktop.
Save eiennohito/1354201 to your computer and use it in GitHub Desktop.
Index: boost/range/join.hpp
===================================================================
--- boost/range/join.hpp (revision 75422)
+++ boost/range/join.hpp (working copy)
@@ -26,7 +26,7 @@
{
public:
typedef iterator_range<
- range_detail::join_iterator<
+ ::boost::range_detail::join_iterator<
BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange1>::type,
BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange2>::type,
BOOST_DEDUCED_TYPENAME range_value<SinglePassRange1>::type
@@ -41,21 +41,21 @@
template<class SinglePassRange1, class SinglePassRange2>
class joined_range
- : public range_detail::joined_type<SinglePassRange1, SinglePassRange2>::type
+ : public ::boost::range_detail::joined_type<SinglePassRange1, SinglePassRange2>::type
{
- typedef range_detail::join_iterator<
+ typedef ::boost::range_detail::join_iterator<
BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange1>::type,
BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange2>::type,
BOOST_DEDUCED_TYPENAME range_value<SinglePassRange1>::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())
)
{
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment