Ticket #9368: prim-patch.patch

boost/graph/prim_minimum_spanning_tree.hpp

@@ -15 +15 @@
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 
 namespace boost {
-  
+
   namespace detail {
     // this should be somewhere else in boost...
     template <class U, class V> struct _project2nd {
@@ -36 +36 @@
                   Weight)
     {
       typedef typename property_traits<Weight>::value_type W;
-      std::less<W> compare;
       detail::_project2nd<W,W> combine;
-      dijkstra_shortest_paths(G, s, params.distance_compare(compare).
-                              distance_combine(combine));
+      dijkstra_shortest_paths
+        (G, s, params.distance_combine(combine));
     }
   } // namespace detail
 
-  template <class VertexListGraph, class DijkstraVisitor, 
+  template <class VertexListGraph, class DijkstraVisitor,
             class PredecessorMap, class DistanceMap,
-            class WeightMap, class IndexMap>
+            class WeightMap, class IndexMap, class BinaryPredicate,
+            class DistZero, class DistInf>
   inline void
   prim_minimum_spanning_tree
     (const VertexListGraph& g,
-     typename graph_traits<VertexListGraph>::vertex_descriptor s, 
-     PredecessorMap predecessor, DistanceMap distance, WeightMap weight, 
+     typename graph_traits<VertexListGraph>::vertex_descriptor s,
+     PredecessorMap predecessor, DistanceMap distance, WeightMap weight,
+     BinaryPredicate compare, DistZero zero, DistInf inf,
      IndexMap index_map,
      DijkstraVisitor vis)
   {
     typedef typename property_traits<WeightMap>::value_type W;
-    std::less<W> compare;
     detail::_project2nd<W,W> combine;
     dijkstra_shortest_paths(g, s, predecessor, distance, weight, index_map,
-                            compare, combine, (std::numeric_limits<W>::max)(), 0,
+                            compare, combine, inf, zero,
                             vis);
   }
 
@@ -70 +70 @@
      const bgl_named_params<P,T,R>& params)
   {
     detail::prim_mst_impl
-      (g, 
-       choose_param(get_param(params, root_vertex_t()), *vertices(g).first), 
+      (g,
+       choose_param(get_param(params, root_vertex_t()), *vertices(g).first),
        params.predecessor_map(p_map),
        choose_const_pmap(get_param(params, edge_weight), g, edge_weight));
   }