[boost][range] - Ticket 5547 - Boost.Range join() ambiguous with Boost.Algorithm join() function. Put the Boost.Range join function into the boost::range namespace and brought out with 'using'

[SVN r72106]
This commit is contained in:
Neil Groves
2011-05-22 21:19:53 +00:00
parent 91428c2110
commit 8810c4c4aa
3 changed files with 51 additions and 0 deletions

View File

@ -36,6 +36,9 @@ public:
} // namespace range_detail
namespace range
{
template<class SinglePassRange1, class SinglePassRange2>
class joined_range
: public range_detail::joined_type<SinglePassRange1, SinglePassRange2>::type
@ -78,6 +81,11 @@ join(SinglePassRange1& r1, SinglePassRange2& r2)
return joined_range<SinglePassRange1, SinglePassRange2>(r1, r2);
}
} // namespace range
using ::boost::range::joined_range;
using ::boost::range::join;
} // namespace boost
#endif // include guard