Ticket #3972: unordered-adjacency_list.patch

boost/pending/container_traits.hpp

@@ -1 @@
-//  (C) Copyright Jeremy Siek 2004 
+//  (C) Copyright Jeremy Siek 2004, 2010
 //  Distributed under the Boost Software License, Version 1.0. (See
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -274 +274 @@
     typedef map_tag category;
     typedef stable_tag iterator_stability; // is this right?
   };
+  template <class Key, class Eq, class Hash, class Alloc>
+  struct container_traits< boost::unordered_multiset<Key,Eq,Hash,Alloc> > {
+    typedef multiset_tag category;
+    typedef stable_tag iterator_stability; // is this right?
+  };
+  template <class Key, class T, class Eq, class Hash, class Alloc>
+  struct container_traits< boost::unordered_multimap<Key,T,Eq,Hash,Alloc> > {
+    typedef multimap_tag category;
+    typedef stable_tag iterator_stability; // is this right?
+  };
 #endif
   template <class Key, class Eq, class Hash, class Alloc>
   set_tag container_category(const boost::unordered_set<Key,Eq,Hash,Alloc>&)
@@ -290 +300 @@
   template <class Key, class T, class Eq, class Hash, class Alloc>
   stable_tag iterator_stability(const boost::unordered_map<Key,T,Eq,Hash,Alloc>&)
   { return stable_tag(); }
+  template <class Key, class Eq, class Hash, class Alloc>
+  multiset_tag
+  container_category(const boost::unordered_multiset<Key,Eq,Hash,Alloc>&)
+  { return multiset_tag(); }
+
+  template <class Key, class T, class Eq, class Hash, class Alloc>
+  multimap_tag
+  container_category(const boost::unordered_multimap<Key,T,Eq,Hash,Alloc>&)
+  { return multimap_tag(); }
+
+  template <class Key, class Eq, class Hash, class Alloc>
+  stable_tag
+  iterator_stability(const boost::unordered_multiset<Key,Eq,Hash,Alloc>&)
+  { return stable_tag(); }
+
+  template <class Key, class T, class Eq, class Hash, class Alloc>
+  stable_tag
+  iterator_stability(const boost::unordered_multimap<Key,T,Eq,Hash,Alloc>&)
+  { return stable_tag(); }
 #endif
 
 

boost/graph/detail/adjacency_list.hpp

@@ -1 +1 @@
 // -*- c++ -*-
 //=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
+// Copyright 1997, 1998, 1999, 2000, 2010 University of Notre Dame.
 // Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
 //
 // Distributed under the Boost Software License, Version 1.0. (See
@@ -1633 +1633 @@
       const Graph& g = static_cast<const Graph&>(g_);
       return g_.edge_dispatch(g, u, v, Cat());
     }
+
+    namespace graph_detail {
+
+      template <class Container,
+                class LessThanComparable,
+                class ContainerCategory>
+      std::pair<typename Container::iterator, typename Container::iterator>
+      equal_range_dispatch(Container& c,
+                           const LessThanComparable& value,
+                           const ContainerCategory&)
+      {
+        // c must be sorted for std::equal_range to behave properly.
+        return std::equal_range(c.begin(), c.end(), value);
+      }
+
+      template <class AssociativeContainer, class LessThanComparable>
+      std::pair<typename AssociativeContainer::iterator,
+                typename AssociativeContainer::iterator>
+      equal_range_dispatch(AssociativeContainer& c,
+                           const LessThanComparable& value,
+                           const associative_container_tag&)
+      {
+        return c.equal_range(value);
+      }
+
+    } // namespace graph_detail
+
     template <class Config, class Base>
     inline std::pair<typename Config::out_edge_iterator,
                      typename Config::out_edge_iterator>
@@ -1649 +1676 @@
       typename Config::OutEdgeList::iterator first, last;
       typename Config::EdgeContainer fake_edge_container;
       tie(first, last) =
-        std::equal_range(el.begin(), el.end(),
-                         StoredEdge(v, fake_edge_container.end(),
-                                    &fake_edge_container));
+        graph_detail::equal_range_dispatch(el,
+                                           StoredEdge(v,
+                                                      fake_edge_container.end(),
+                                                      &fake_edge_container),
+                                           container_category(el));
       return std::make_pair(out_edge_iterator(first, u),
                             out_edge_iterator(last, u));
     }

boost/graph/adjacency_list.hpp

@@ -1 +1 @@
 //=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
+// Copyright 1997, 1998, 1999, 2000, 2010 University of Notre Dame.
 // Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
 //
 // Distributed under the Boost Software License, Version 1.0. (See
@@ -254 +254 @@
     typedef disallow_parallel_edge_tag type;
   };
 
+  template <>
+  struct parallel_edge_traits<hash_multisetS> {
+    typedef allow_parallel_edge_tag type;
+  };
+
+  template <>
+  struct parallel_edge_traits<hash_multimapS> {
+    typedef allow_parallel_edge_tag type;
+  };
+
   namespace detail {
     template <class Directed> struct is_random_access {
       enum { value = false};