From 13ddcb4eef45f3332da602436ff704c278ca7ffa Mon Sep 17 00:00:00 2001
From: Jeremy Siek <jeremy.siek@gmail.com>
Date: Mon, 22 Jan 2001 21:46:09 +0000
Subject: [PATCH] changed get_property return type to use graph_property

[SVN r8721]
---
 include/boost/graph/adjacency_list.hpp | 12 ++++++++++--
 include/boost/graph/read_dimacs.hpp    |  1 -
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/boost/graph/adjacency_list.hpp b/include/boost/graph/adjacency_list.hpp
index 9fe92e52..041f3351 100644
--- a/include/boost/graph/adjacency_list.hpp
+++ b/include/boost/graph/adjacency_list.hpp
@@ -340,6 +340,7 @@ namespace boost {
 
     typedef EdgeProperty edge_property_type;
     typedef VertexProperty vertex_property_type;
+    typedef GraphProperty graph_property_type;
 
     inline adjacency_list(const GraphProperty& p = GraphProperty()) 
       : m_property(p) { }
@@ -381,9 +382,16 @@ namespace boost {
     GraphProperty m_property;
   };
 
+  template <class Graph, class Property>
+  class graph_property {
+  public:
+    typedef typename property_value<typename Graph::graph_property_type, 
+      Property>::type type;
+  };
+
   template <class EL, class VL, class DS, class VP,class EP,class GP,class Tag>
   inline
-  typename property_value<GP, Tag>::type&
+  typename graph_property<adjacency_list<EL,VL,DS,VP,EP,GP>, Tag>::type&
   get_property(adjacency_list<EL,VL,DS,VP,EP,GP>& g, Tag) {
     typedef typename property_value<GP, Tag>::type value_type;
     return get_property_value(g.m_property, value_type(), Tag());
@@ -391,7 +399,7 @@ namespace boost {
 
   template <class EL, class VL, class DS, class VP,class EP,class GP,class Tag>
   inline
-  const typename property_value<GP, Tag>::type&
+  const typename graph_property<adjacency_list<EL,VL,DS,VP,EP,GP>, Tag>::type&
   get_property(const adjacency_list<EL,VL,DS,VP,EP,GP>& g, Tag) {
     typedef typename property_value<GP, Tag>::type value_type;
     return get_property_value(g.m_property, value_type(), Tag());
diff --git a/include/boost/graph/read_dimacs.hpp b/include/boost/graph/read_dimacs.hpp
index cc48b131..4c5d93b9 100644
--- a/include/boost/graph/read_dimacs.hpp
+++ b/include/boost/graph/read_dimacs.hpp
@@ -208,7 +208,6 @@ int read_dimacs_max_flow(Graph& g,
       default:
         /* wrong type of node-line */
         err_no = EN12; goto error; 
-        break;
       }
       break;