[Boost-commit] svn:boost r50813 - in trunk: boost/graph libs/graph/doc

Subject: [Boost-commit] svn:boost r50813 - in trunk: boost/graph libs/graph/doc
From: jewillco_at_[hidden]
Date: 2009-01-27 15:07:26

Author: jewillco
Date: 2009-01-27 15:07:25 EST (Tue, 27 Jan 2009)
New Revision: 50813
URL: http://svn.boost.org/trac/boost/changeset/50813

Log:
Changed template parameter names to match removal of Vertex List Graph requirement
Text files modified: 
   trunk/boost/graph/dijkstra_shortest_paths.hpp     |    18 +++++++++---------                      
   trunk/libs/graph/doc/dijkstra_shortest_paths.html |     6 +++---                                  
   2 files changed, 12 insertions(+), 12 deletions(-)

Modified: trunk/boost/graph/dijkstra_shortest_paths.hpp
==============================================================================
--- trunk/boost/graph/dijkstra_shortest_paths.hpp	(original)
+++ trunk/boost/graph/dijkstra_shortest_paths.hpp	2009-01-27 15:07:25 EST (Tue, 27 Jan 2009)
@@ -183,14 +183,14 @@
   }
 
   // Call breadth first search with default color map.
-  template <class VertexListGraph, class DijkstraVisitor,
+  template <class Graph, class DijkstraVisitor,
             class PredecessorMap, class DistanceMap,
             class WeightMap, class IndexMap, class Compare, class Combine,
             class DistZero>
   inline void
   dijkstra_shortest_paths_no_init
-    (const VertexListGraph& g,
-     typename graph_traits<VertexListGraph>::vertex_descriptor s,
+    (const Graph& g,
+     typename graph_traits<Graph>::vertex_descriptor s,
      PredecessorMap predecessor, DistanceMap distance, WeightMap weight,
      IndexMap index_map,
      Compare compare, Combine combine, DistZero zero,
@@ -198,7 +198,7 @@
   {
     boost::scoped_array<default_color_type> color_map_holder;
     typedef
-      detail::vertex_property_map_generator<VertexListGraph, IndexMap, default_color_type>
+      detail::vertex_property_map_generator<Graph, IndexMap, default_color_type>
       ColorMapHelper;
     typedef typename ColorMapHelper::type ColorMap;
     ColorMap color =
@@ -209,14 +209,14 @@
   }
 
   // Call breadth first search
-  template <class VertexListGraph, class DijkstraVisitor,
+  template <class Graph, class DijkstraVisitor,
             class PredecessorMap, class DistanceMap,
             class WeightMap, class IndexMap, class Compare, class Combine,
             class DistZero, class ColorMap>
   inline void
   dijkstra_shortest_paths_no_init
-    (const VertexListGraph& g,
-     typename graph_traits<VertexListGraph>::vertex_descriptor s,
+    (const Graph& g,
+     typename graph_traits<Graph>::vertex_descriptor s,
      PredecessorMap predecessor, DistanceMap distance, WeightMap weight,
      IndexMap index_map,
      Compare compare, Combine combine, DistZero zero,
@@ -225,7 +225,7 @@
     typedef indirect_cmp<DistanceMap, Compare> IndirectCmp;
     IndirectCmp icmp(distance, compare);
 
-    typedef typename graph_traits<VertexListGraph>::vertex_descriptor Vertex;
+    typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
 
 #ifdef BOOST_GRAPH_DIJKSTRA_TESTING
     if (!dijkstra_relaxed_heap) {
@@ -248,7 +248,7 @@
 #else // Now the default: use a d-ary heap
       boost::scoped_array<std::size_t> index_in_heap_map_holder;
       typedef
-        detail::vertex_property_map_generator<VertexListGraph, IndexMap, std::size_t>
+        detail::vertex_property_map_generator<Graph, IndexMap, std::size_t>
         IndexInHeapMapHelper;
       typedef typename IndexInHeapMapHelper::type IndexInHeapMap;
       IndexInHeapMap index_in_heap =

Modified: trunk/libs/graph/doc/dijkstra_shortest_paths.html
==============================================================================
--- trunk/libs/graph/doc/dijkstra_shortest_paths.html	(original)
+++ trunk/libs/graph/doc/dijkstra_shortest_paths.html	2009-01-27 15:07:25 EST (Tue, 27 Jan 2009)
@@ -43,14 +43,14 @@
    DijkstraVisitor vis, ColorMap color = <i>default</i>)
 
 <i>// version that does not initialize the property maps (except for the default color map)</i>
-template &lt;class VertexListGraph, class DijkstraVisitor,
+template &lt;class Graph, class DijkstraVisitor,
           class PredecessorMap, class DistanceMap,
           class WeightMap, class IndexMap, class Compare, class Combine,
           class DistZero, class ColorMap&gt;
 void
 dijkstra_shortest_paths_no_init
-  (const VertexListGraph&amp; g,
-   typename graph_traits&lt;VertexListGraph&gt;::vertex_descriptor s,
+  (const Graph&amp; g,
+   typename graph_traits&lt;Graph&gt;::vertex_descriptor s,
    PredecessorMap predecessor, DistanceMap distance, WeightMap weight,
    IndexMap index_map,
    Compare compare, Combine combine, DistZero zero,