Boost.Range algorithms are now in the boost::range namespace and brought into boost by the appropriate using statement. This allows better interoperation with Boost.Algorithm since errors only occur when the use calls similarly named ambiguous functions. In this event the user can disambiguate by using algorithm::xxx() or range::xxx(). This iteration also updates the concept assert code in the range algorithms.

[SVN r61023]

include/boost/range/algorithm/swap_ranges.hpp

@@ -57,25 +57,31 @@ namespace boost
         }
     } // namespace range_detail
 
-    /// \brief template function swap_ranges
-    ///
-    /// range-based version of the swap_ranges std algorithm
-    ///
-    /// \pre SinglePassRange1 is a model of the SinglePassRangeConcept
-    /// \pre SinglePassRange2 is a model of the SinglePassRangeConcept
-    template< typename SinglePassRange1, typename SinglePassRange2 >
-    inline SinglePassRange2&
-    swap_ranges(SinglePassRange1& range1, SinglePassRange2& range2)
+    namespace range
     {
-        BOOST_CONCEPT_ASSERT((SinglePassRangeConcept<SinglePassRange1>));
-        BOOST_CONCEPT_ASSERT((SinglePassRangeConcept<SinglePassRange2>));
 
-        boost::range_detail::swap_ranges_impl(
-            boost::begin(range1), boost::end(range1),
-            boost::begin(range2), boost::end(range2));
+/// \brief template function swap_ranges
+///
+/// range-based version of the swap_ranges std algorithm
+///
+/// \pre SinglePassRange1 is a model of the SinglePassRangeConcept
+/// \pre SinglePassRange2 is a model of the SinglePassRangeConcept
+template< typename SinglePassRange1, typename SinglePassRange2 >
+inline SinglePassRange2&
+swap_ranges(SinglePassRange1& range1, SinglePassRange2& range2)
+{
+    BOOST_CONCEPT_ASSERT((SinglePassRangeConcept<SinglePassRange1>));
+    BOOST_CONCEPT_ASSERT((SinglePassRangeConcept<SinglePassRange2>));
 
-        return range2;
-    }
+    boost::range_detail::swap_ranges_impl(
+        boost::begin(range1), boost::end(range1),
+        boost::begin(range2), boost::end(range2));
+
+    return range2;
 }
 
+    } // namespace range
+    using range::swap_ranges;
+} // namespace boost
+
 #endif // include guard