[Boost-commit] svn:boost r78330 - trunk/libs/graph/test

Subject: [Boost-commit] svn:boost r78330 - trunk/libs/graph/test
From: jewillco_at_[hidden]
Date: 2012-05-04 23:08:50

Author: jewillco
Date: 2012-05-04 23:08:49 EDT (Fri, 04 May 2012)
New Revision: 78330
URL: http://svn.boost.org/trac/boost/changeset/78330

Log:
Removed use of Boost.Typeof to enhance portability; using Boost.ResultOf instead
Text files modified: 
   trunk/libs/graph/test/stoer_wagner_test.cpp |     8 +++++---                                
   1 files changed, 5 insertions(+), 3 deletions(-)

Modified: trunk/libs/graph/test/stoer_wagner_test.cpp
==============================================================================
--- trunk/libs/graph/test/stoer_wagner_test.cpp	(original)
+++ trunk/libs/graph/test/stoer_wagner_test.cpp	2012-05-04 23:08:49 EDT (Fri, 04 May 2012)
@@ -206,10 +206,12 @@
   boost::associative_property_map<std::map<vertex_descriptor, std::size_t> > components(component);
   BOOST_CHECK_EQUAL(boost::connected_components(g, components), 1U); // verify the connectedness assumption
   
-  boost::shared_array_property_map<weight_type, boost::property_map<undirected_graph, boost::vertex_index_t>::const_type> distances = boost::make_shared_array_property_map(num_vertices(g), weight_type(0), get(boost::vertex_index, g));
+  typedef boost::shared_array_property_map<weight_type, boost::property_map<undirected_graph, boost::vertex_index_t>::const_type> distances_type;
+  distances_type distances = boost::make_shared_array_property_map(num_vertices(g), weight_type(0), get(boost::vertex_index, g));
   typedef std::vector<vertex_descriptor>::size_type index_in_heap_type;
-  boost::shared_array_property_map<index_in_heap_type, boost::property_map<undirected_graph, boost::vertex_index_t>::const_type> indicesInHeap = boost::make_shared_array_property_map(num_vertices(g), index_in_heap_type(-1), get(boost::vertex_index, g));
-  boost::d_ary_heap_indirect<vertex_descriptor, 22, BOOST_TYPEOF(indicesInHeap), BOOST_TYPEOF(distances), std::greater<weight_type> > pq(distances, indicesInHeap);
+  typedef boost::shared_array_property_map<index_in_heap_type, boost::property_map<undirected_graph, boost::vertex_index_t>::const_type> indicesInHeap_type;
+  indicesInHeap_type indicesInHeap = boost::make_shared_array_property_map(num_vertices(g), index_in_heap_type(-1), get(boost::vertex_index, g));
+  boost::d_ary_heap_indirect<vertex_descriptor, 22, indicesInHeap_type, distances_type, std::greater<weight_type> > pq(distances, indicesInHeap);
   
   int w = boost::stoer_wagner_min_cut(g, get(boost::edge_weight, g), boost::max_priority_queue(pq));
   BOOST_CHECK_EQUAL(w, 3407);