[Boost-commit] svn:boost r47658 - sandbox/SOC/2008/graphs/trunk/boost/graphs

From: asutton_at_[hidden]
Date: 2008-07-21 11:35:42

Author: asutton
Date: 2008-07-21 11:35:42 EDT (Mon, 21 Jul 2008)
New Revision: 47658
URL: http://svn.boost.org/trac/boost/changeset/47658

Log:
Fixing a bug that was (very unfortunately) instantiating undirected vertices
over the edge properties. Oops.

Text files modified: 
   sandbox/SOC/2008/graphs/trunk/boost/graphs/undirected_graph.hpp |    16 ++++------------                        
   sandbox/SOC/2008/graphs/trunk/boost/graphs/undirected_types.hpp |     2 +-                                      
   2 files changed, 5 insertions(+), 13 deletions(-)

Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/undirected_graph.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/undirected_graph.hpp	(original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/undirected_graph.hpp	2008-07-21 11:35:42 EDT (Mon, 21 Jul 2008)
@@ -653,25 +653,17 @@
 undirected_graph<VP,EP,VS,ES>::edges() const
 { return std::make_pair(begin_edges(), end_edges()); }
 
-/**
- * Return the number of iterators in this graph.
- */
+/** Return the number of iterators in this graph. */
 template <BOOST_GRAPH_UG_PARAMS>
 typename undirected_graph<VP,EP,VS,ES>::vertices_size_type
 undirected_graph<VP,EP,VS,ES>::num_vertices() const
-{
-    return _verts.size();
-}
+{ return _verts.size(); }
 
-/**
- * Return the number of edges in this graph.
- */
+/** Return the number of edges in this graph. */
 template <BOOST_GRAPH_UG_PARAMS>
 typename undirected_graph<VP,EP,VS,ES>::edges_size_type
 undirected_graph<VP,EP,VS,ES>::num_edges() const
-{
-    return _props.size();
-}
+{ return _props.size(); }
 
 /** Return an iterator to the first incident edge of the given vertex. */
 template <BOOST_GRAPH_UG_PARAMS>

Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/undirected_types.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/undirected_types.hpp	(original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/undirected_types.hpp	2008-07-21 11:35:42 EDT (Mon, 21 Jul 2008)
@@ -58,7 +58,7 @@
     typedef std::pair<incident_edge_iterator, incident_edge_iterator> incident_edge_range;
 
     // Generate the vertex type and its store and key type.
-    typedef undirected_vertex<EdgeProps, incidence_store> vertex_type;
+    typedef undirected_vertex<VertexProps, incidence_store> vertex_type;
     typedef typename VertexStore::template store<vertex_type>::type vertex_store;
     typedef typename vertex_store::size_type vertices_size_type;
     typedef typename vertex_store::vertex_iterator vertex_iterator;