Subject: [Boost-commit] svn:boost r61084 - in branches/release/boost: detail graph
From: jewillco_at_[hidden]
Date: 2010-04-05 17:16:50
Author: jewillco
Date: 2010-04-05 17:16:50 EDT (Mon, 05 Apr 2010)
New Revision: 61084
URL: http://svn.boost.org/trac/boost/changeset/61084
Log:
Changed to Boost.Range for duplicate algorithms, merging the rest of r60919 from trunk
Text files modified:
branches/release/boost/detail/algorithm.hpp | 170 ++-------------------------------------
branches/release/boost/graph/graph_test.hpp | 2
2 files changed, 13 insertions(+), 159 deletions(-)
Modified: branches/release/boost/detail/algorithm.hpp
==============================================================================
--- branches/release/boost/detail/algorithm.hpp (original)
+++ branches/release/boost/detail/algorithm.hpp 2010-04-05 17:16:50 EDT (Mon, 05 Apr 2010)
@@ -40,117 +40,26 @@
#include <algorithm>
#include <vector>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/algorithm/copy.hpp>
+#include <boost/range/algorithm/equal.hpp>
+#include <boost/range/algorithm/sort.hpp>
+#include <boost/range/algorithm/stable_sort.hpp>
+#include <boost/range/algorithm/find_if.hpp>
+#include <boost/range/algorithm/count.hpp>
+#include <boost/range/algorithm/count_if.hpp>
+#include <boost/range/algorithm_ext/is_sorted.hpp>
+#include <boost/range/algorithm_ext/iota.hpp>
namespace boost {
- template <typename Iter1, typename Iter2>
- Iter1 begin(const std::pair<Iter1, Iter2>& p) { return p.first; }
-
- template <typename Iter1, typename Iter2>
- Iter2 end(const std::pair<Iter1, Iter2>& p) { return p.second; }
-
- template <typename Iter1, typename Iter2>
- typename boost::detail::iterator_traits<Iter1>::difference_type
- size(const std::pair<Iter1, Iter2>& p) {
- return std::distance(p.first, p.second);
- }
-
-#if 0
- // These seem to interfere with the std::pair overloads :(
- template <typename Container>
- typename Container::iterator
- begin(Container& c) { return c.begin(); }
-
- template <typename Container>
- typename Container::const_iterator
- begin(const Container& c) { return c.begin(); }
-
- template <typename Container>
- typename Container::iterator
- end(Container& c) { return c.end(); }
-
- template <typename Container>
- typename Container::const_iterator
- end(const Container& c) { return c.end(); }
-
- template <typename Container>
- typename Container::size_type
- size(const Container& c) { return c.size(); }
-#else
- template <typename T>
- typename std::vector<T>::iterator
- begin(std::vector<T>& c) { return c.begin(); }
-
- template <typename T>
- typename std::vector<T>::const_iterator
- begin(const std::vector<T>& c) { return c.begin(); }
-
- template <typename T>
- typename std::vector<T>::iterator
- end(std::vector<T>& c) { return c.end(); }
-
- template <typename T>
- typename std::vector<T>::const_iterator
- end(const std::vector<T>& c) { return c.end(); }
-
- template <typename T>
- typename std::vector<T>::size_type
- size(const std::vector<T>& c) { return c.size(); }
-#endif
-
- template <class ForwardIterator, class T>
- void iota(ForwardIterator first, ForwardIterator last, T value)
- {
- for (; first != last; ++first, ++value)
- *first = value;
- }
- template <typename Container, typename T>
- void iota(Container& c, const T& value)
- {
- iota(begin(c), end(c), value);
- }
-
- // Also do version with 2nd container?
- template <typename Container, typename OutIter>
- OutIter copy(const Container& c, OutIter result) {
- return std::copy(begin(c), end(c), result);
- }
-
- template <typename Container1, typename Container2>
- bool equal(const Container1& c1, const Container2& c2)
- {
- if (size(c1) != size(c2))
- return false;
- return std::equal(begin(c1), end(c1), begin(c2));
- }
-
- template <typename Container>
- void sort(Container& c) { std::sort(begin(c), end(c)); }
-
- template <typename Container, typename Predicate>
- void sort(Container& c, const Predicate& p) {
- std::sort(begin(c), end(c), p);
- }
-
- template <typename Container>
- void stable_sort(Container& c) { std::stable_sort(begin(c), end(c)); }
-
- template <typename Container, typename Predicate>
- void stable_sort(Container& c, const Predicate& p) {
- std::stable_sort(begin(c), end(c), p);
- }
-
- template <typename Container, typename Predicate>
- typename Container::const_iterator find_if(const Container& c, Predicate p)
- {
- return find_if(begin(c), end(c), p);
- }
-
template <typename InputIterator, typename Predicate>
bool any_if(InputIterator first, InputIterator last, Predicate p)
{
return std::find_if(first, last, p) != last;
}
+
template <typename Container, typename Predicate>
bool any_if(const Container& c, Predicate p)
{
@@ -168,61 +77,6 @@
return container_contains(begin(c), end(c), value);
}
- template <typename Container, typename T>
- std::size_t count(const Container& c, const T& value)
- {
- return std::count(begin(c), end(c), value);
- }
-
- template <typename Container, typename Predicate>
- std::size_t count_if(const Container& c, Predicate p)
- {
- return std::count_if(begin(c), end(c), p);
- }
-
- template <typename ForwardIterator>
- bool is_sorted(ForwardIterator first, ForwardIterator last)
- {
- if (first == last)
- return true;
-
- ForwardIterator next = first;
- for (++next; next != last; first = next, ++next) {
- if (*next < *first)
- return false;
- }
-
- return true;
- }
-
- template <typename ForwardIterator, typename StrictWeakOrdering>
- bool is_sorted(ForwardIterator first, ForwardIterator last,
- StrictWeakOrdering comp)
- {
- if (first == last)
- return true;
-
- ForwardIterator next = first;
- for (++next; next != last; first = next, ++next) {
- if (comp(*next, *first))
- return false;
- }
-
- return true;
- }
-
- template <typename Container>
- bool is_sorted(const Container& c)
- {
- return is_sorted(begin(c), end(c));
- }
-
- template <typename Container, typename StrictWeakOrdering>
- bool is_sorted(const Container& c, StrictWeakOrdering comp)
- {
- return is_sorted(begin(c), end(c), comp);
- }
-
} // namespace boost
#endif // BOOST_ALGORITHM_HPP
Modified: branches/release/boost/graph/graph_test.hpp
==============================================================================
--- branches/release/boost/graph/graph_test.hpp (original)
+++ branches/release/boost/graph/graph_test.hpp 2010-04-05 17:16:50 EDT (Mon, 05 Apr 2010)
@@ -18,7 +18,7 @@
#include <boost/graph/copy.hpp>
#include <boost/graph/graph_utility.hpp> // for connects
#include <boost/range.hpp>
-#include <boost/detail/algorithm.hpp>
+#include <boost/range/algorithm/find_if.hpp>
// UNDER CONSTRUCTION