Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r77916 - trunk/libs/graph/test
From: jewillco_at_[hidden]
Date: 2012-04-11 12:26:52


Author: jewillco
Date: 2012-04-11 12:26:51 EDT (Wed, 11 Apr 2012)
New Revision: 77916
URL: http://svn.boost.org/trac/boost/changeset/77916

Log:
Removed uses of Boost.Typeof to hopefully help on XLC
Text files modified:
   trunk/libs/graph/test/stoer_wagner_test.cpp | 4 ++--
   1 files changed, 2 insertions(+), 2 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-04-11 12:26:51 EDT (Wed, 11 Apr 2012)
@@ -206,9 +206,9 @@
   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_AUTO(distances, (boost::make_shared_array_property_map(num_vertices(g), weight_type(0), get(boost::vertex_index, g))));
+ 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 std::vector<vertex_descriptor>::size_type index_in_heap_type;
- BOOST_AUTO(indicesInHeap, (boost::make_shared_array_property_map(num_vertices(g), index_in_heap_type(-1), get(boost::vertex_index, g))));
+ 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);
   
   int w = boost::stoer_wagner_min_cut(g, get(boost::edge_weight, g), boost::max_priority_queue(pq));


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk