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]
2010-04-03 19:14:13 +00:00
parent b4ae711d4e
commit 22c72c53eb
52 changed files with 2766 additions and 2461 deletions
--- a/include/boost/range/algorithm/search_n.hpp
+++ b/include/boost/range/algorithm/search_n.hpp
@ -19,122 +19,127 @@

 namespace boost
 {
-    /// \brief template function search
-    ///
-    /// range-based version of the search std algorithm
-    ///
-    /// \pre ForwardRange is a model of the ForwardRangeConcept
-    /// \pre Integer is an integral type
-    /// \pre Value is a model of the EqualityComparableConcept
-    /// \pre ForwardRange's value type is a model of the EqualityComparableConcept
-    /// \pre Object's of ForwardRange's value type can be compared for equality with Objects of type Value
-    template< typename ForwardRange, typename Integer, typename Value >
-    inline typename range_iterator<ForwardRange>::type
-    search_n(ForwardRange& rng, Integer count, const Value& value)
+    namespace range
    {
-        BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
-        return std::search_n(boost::begin(rng),boost::end(rng), count, value);
-    }

-    /// \overload
-    template< typename ForwardRange, typename Integer, typename Value >
-    inline typename range_iterator<const ForwardRange>::type
-    search_n(const ForwardRange& rng, Integer count, const Value& value)
-    {
-        BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
-        return std::search_n(boost::begin(rng), boost::end(rng), count, value);
-    }
+/// \brief template function search
+///
+/// range-based version of the search std algorithm
+///
+/// \pre ForwardRange is a model of the ForwardRangeConcept
+/// \pre Integer is an integral type
+/// \pre Value is a model of the EqualityComparableConcept
+/// \pre ForwardRange's value type is a model of the EqualityComparableConcept
+/// \pre Object's of ForwardRange's value type can be compared for equality with Objects of type Value
+template< typename ForwardRange, typename Integer, typename Value >
+inline typename range_iterator<ForwardRange>::type
+search_n(ForwardRange& rng, Integer count, const Value& value)
+{
+    BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
+    return std::search_n(boost::begin(rng),boost::end(rng), count, value);
+}

-    /// \overload
-    template< typename ForwardRange, typename Integer, class Value,
-              typename BinaryPredicate >
-    inline typename range_iterator<ForwardRange>::type
-    search_n(ForwardRange& rng, Integer count, const Value& value,
-             BinaryPredicate binary_pred)
-    {
-        BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
-        BOOST_CONCEPT_ASSERT((BinaryPredicateConcept<BinaryPredicate,
-            typename range_value<ForwardRange>::type, const Value&>));
-        return std::search_n(boost::begin(rng), boost::end(rng),
-            count, value, binary_pred);
-	}
+/// \overload
+template< typename ForwardRange, typename Integer, typename Value >
+inline typename range_iterator<const ForwardRange>::type
+search_n(const ForwardRange& rng, Integer count, const Value& value)
+{
+    BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
+    return std::search_n(boost::begin(rng), boost::end(rng), count, value);
+}

-    /// \overload
-    template< typename ForwardRange, typename Integer, typename Value,
-              typename BinaryPredicate >
-    inline typename range_iterator<const ForwardRange>::type
-    search_n(const ForwardRange& rng, Integer count, const Value& value,
-             BinaryPredicate binary_pred)
-    {
-        BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
-        BOOST_CONCEPT_ASSERT((BinaryPredicateConcept<BinaryPredicate,
-            typename range_value<const ForwardRange>::type, const Value&>));
-        return std::search_n(boost::begin(rng), boost::end(rng),
-            count, value, binary_pred);
-    }
+/// \overload
+template< typename ForwardRange, typename Integer, class Value,
+          typename BinaryPredicate >
+inline typename range_iterator<ForwardRange>::type
+search_n(ForwardRange& rng, Integer count, const Value& value,
+         BinaryPredicate binary_pred)
+{
+    BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
+    BOOST_CONCEPT_ASSERT((BinaryPredicateConcept<BinaryPredicate,
+        typename range_value<ForwardRange>::type, const Value&>));
+    return std::search_n(boost::begin(rng), boost::end(rng),
+        count, value, binary_pred);
+}
+
+/// \overload
+template< typename ForwardRange, typename Integer, typename Value,
+          typename BinaryPredicate >
+inline typename range_iterator<const ForwardRange>::type
+search_n(const ForwardRange& rng, Integer count, const Value& value,
+         BinaryPredicate binary_pred)
+{
+    BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
+    BOOST_CONCEPT_ASSERT((BinaryPredicateConcept<BinaryPredicate,
+        typename range_value<const ForwardRange>::type, const Value&>));
+    return std::search_n(boost::begin(rng), boost::end(rng),
+        count, value, binary_pred);
+}

 // range_return overloads

-    /// \overload
-    template< range_return_value re, typename ForwardRange, typename Integer,
-              typename Value >
-    inline typename range_return<ForwardRange,re>::type
-    search_n(ForwardRange& rng, Integer count, const Value& value)
-    {
-        BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
-        return range_return<ForwardRange,re>::
-            pack(std::search_n(boost::begin(rng),boost::end(rng),
-                               count, value),
-                 rng);
-    }
-
-    /// \overload
-    template< range_return_value re, typename ForwardRange, typename Integer,
-              class Value >
-    inline typename range_return<const ForwardRange,re>::type
-    search_n(const ForwardRange& rng, Integer count, const Value& value)
-    {
-        BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
-        return range_return<const ForwardRange,re>::
-            pack(std::search_n(boost::begin(rng), boost::end(rng),
-                               count, value),
-                 rng);
-    }
-
-    /// \overload
-    template< range_return_value re, typename ForwardRange, typename Integer,
-              typename Value, typename BinaryPredicate >
-    inline typename range_return<ForwardRange,re>::type
-    search_n(ForwardRange& rng, Integer count, const Value& value,
-             BinaryPredicate pred)
-    {
-        BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
-        BOOST_CONCEPT_ASSERT((BinaryPredicateConcept<BinaryPredicate,
-            typename range_value<ForwardRange>::type,
-            const Value&>));
-        return range_return<ForwardRange,re>::
-            pack(std::search_n(boost::begin(rng), boost::end(rng),
-                               count, value, pred),
-                 rng);
-    }
-
-    /// \overload
-    template< range_return_value re, typename ForwardRange, typename Integer,
-              typename Value, typename BinaryPredicate >
-    inline typename range_return<const ForwardRange,re>::type
-    search_n(const ForwardRange& rng, Integer count, const Value& value,
-             BinaryPredicate pred)
-    {
-        BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
-        BOOST_CONCEPT_ASSERT((BinaryPredicateConcept<BinaryPredicate,
-            typename range_value<const ForwardRange>::type,
-            const Value&>));
-        return range_return<const ForwardRange,re>::
-            pack(std::search_n(boost::begin(rng), boost::end(rng),
-                               count, value, pred),
-                 rng);
-    }
-
+/// \overload
+template< range_return_value re, typename ForwardRange, typename Integer,
+          typename Value >
+inline typename range_return<ForwardRange,re>::type
+search_n(ForwardRange& rng, Integer count, const Value& value)
+{
+    BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
+    return range_return<ForwardRange,re>::
+        pack(std::search_n(boost::begin(rng),boost::end(rng),
+                           count, value),
+             rng);
 }

+/// \overload
+template< range_return_value re, typename ForwardRange, typename Integer,
+          class Value >
+inline typename range_return<const ForwardRange,re>::type
+search_n(const ForwardRange& rng, Integer count, const Value& value)
+{
+    BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
+    return range_return<const ForwardRange,re>::
+        pack(std::search_n(boost::begin(rng), boost::end(rng),
+                           count, value),
+             rng);
+}
+
+/// \overload
+template< range_return_value re, typename ForwardRange, typename Integer,
+          typename Value, typename BinaryPredicate >
+inline typename range_return<ForwardRange,re>::type
+search_n(ForwardRange& rng, Integer count, const Value& value,
+         BinaryPredicate pred)
+{
+    BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
+    BOOST_CONCEPT_ASSERT((BinaryPredicateConcept<BinaryPredicate,
+        typename range_value<ForwardRange>::type,
+        const Value&>));
+    return range_return<ForwardRange,re>::
+        pack(std::search_n(boost::begin(rng), boost::end(rng),
+                           count, value, pred),
+             rng);
+}
+
+/// \overload
+template< range_return_value re, typename ForwardRange, typename Integer,
+          typename Value, typename BinaryPredicate >
+inline typename range_return<const ForwardRange,re>::type
+search_n(const ForwardRange& rng, Integer count, const Value& value,
+         BinaryPredicate pred)
+{
+    BOOST_CONCEPT_ASSERT((ForwardRangeConcept<ForwardRange>));
+    BOOST_CONCEPT_ASSERT((BinaryPredicateConcept<BinaryPredicate,
+        typename range_value<const ForwardRange>::type,
+        const Value&>));
+    return range_return<const ForwardRange,re>::
+        pack(std::search_n(boost::begin(rng), boost::end(rng),
+                           count, value, pred),
+             rng);
+}
+
+    } // namespace range
+    using range::search_n;
+} // namespace boost
+
 #endif // include guard