[Boost-commit] svn:boost r80511 - trunk/boost/graph

Subject: [Boost-commit] svn:boost r80511 - trunk/boost/graph
From: jewillco_at_[hidden]
Date: 2012-09-13 09:18:37

Author: jewillco
Date: 2012-09-13 09:18:36 EDT (Thu, 13 Sep 2012)
New Revision: 80511
URL: http://svn.boost.org/trac/boost/changeset/80511

Log:
Applied patch from #7327; fixes #7327
Text files modified: 
   trunk/boost/graph/filtered_graph.hpp |     2 +-                                      
   trunk/boost/graph/labeled_graph.hpp  |     6 +++---                                  
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/graph/filtered_graph.hpp
==============================================================================
--- trunk/boost/graph/filtered_graph.hpp	(original)
+++ trunk/boost/graph/filtered_graph.hpp	2012-09-13 09:18:36 EDT (Thu, 13 Sep 2012)
@@ -210,7 +210,7 @@
 
     static vertex_descriptor null_vertex()
     {
-       return Graph::null_vertex();
+       return Traits::null_vertex();
     }
 
     //private:

Modified: trunk/boost/graph/labeled_graph.hpp
==============================================================================
--- trunk/boost/graph/labeled_graph.hpp	(original)
+++ trunk/boost/graph/labeled_graph.hpp	2012-09-13 09:18:36 EDT (Thu, 13 Sep 2012)
@@ -196,7 +196,7 @@
     {
         // If the element is already occupied, then we probably don't want to
         // overwrite it.
-        if(c[l] == Graph::null_vertex()) return false;
+        if(c[l] == graph_traits<Graph>::null_vertex()) return false;
         c[l] = v;
         return true;
     }
@@ -411,7 +411,7 @@
 
     /** Return a null descriptor */
     static vertex_descriptor null_vertex()
-    { return graph_type::null_vertex(); }
+    { return graph_traits<graph_type>::null_vertex(); }
 
 private:
     graph_type _graph;
@@ -525,7 +525,7 @@
 #endif
 
     static vertex_descriptor null_vertex()
-    { return graph_type::null_vertex(); }
+    { return graph_traits<graph_type>::null_vertex(); }
 
 private:
     graph_type* _graph;