Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r55357 - in branches/release: boost/graph status
From: jewillco_at_[hidden]
Date: 2009-08-01 22:46:13


Author: jewillco
Date: 2009-08-01 22:46:12 EDT (Sat, 01 Aug 2009)
New Revision: 55357
URL: http://svn.boost.org/trac/boost/changeset/55357

Log:
Merged r55265, r55266, r55355, and r55356 from trunk, hopefully fixing VC++ problems; removed VC++ from csr_graph_test known failures for regression tests
Properties modified:
   branches/release/boost/graph/ (props changed)
   branches/release/status/ (props changed)
Text files modified:
   branches/release/boost/graph/compressed_sparse_row_graph.hpp | 44 +++++++++------------------------------
   branches/release/status/explicit-failures-markup.xml | 11 ----------
   2 files changed, 10 insertions(+), 45 deletions(-)

Modified: branches/release/boost/graph/compressed_sparse_row_graph.hpp
==============================================================================
--- branches/release/boost/graph/compressed_sparse_row_graph.hpp (original)
+++ branches/release/boost/graph/compressed_sparse_row_graph.hpp 2009-08-01 22:46:12 EDT (Sat, 01 Aug 2009)
@@ -1687,27 +1687,23 @@
   return key.idx;
 }
 
-// Doing the right thing here (by unifying with vertex_index_t and
-// edge_index_t) breaks GCC.
-template<BOOST_CSR_GRAPH_TEMPLATE_PARMS, typename Tag>
-struct property_map<BOOST_CSR_GRAPH_TYPE, Tag>
+template<BOOST_CSR_GRAPH_TEMPLATE_PARMS>
+struct property_map<BOOST_CSR_GRAPH_TYPE, vertex_index_t>
+{
+ typedef identity_property_map type;
+ typedef type const_type;
+};
+
+template<BOOST_CSR_GRAPH_TEMPLATE_PARMS>
+struct property_map<BOOST_CSR_GRAPH_TYPE, edge_index_t>
 {
 private:
- typedef identity_property_map vertex_index_type;
   typedef typename graph_traits<BOOST_CSR_GRAPH_TYPE>::edge_descriptor
     edge_descriptor;
   typedef csr_edge_index_map<EdgeIndex, edge_descriptor> edge_index_type;
 
- typedef typename mpl::if_<is_same<Tag, edge_index_t>,
- edge_index_type,
- detail::error_property_not_found>::type
- edge_or_none;
-
 public:
- typedef typename mpl::if_<is_same<Tag, vertex_index_t>,
- vertex_index_type,
- edge_or_none>::type type;
-
+ typedef edge_index_type type;
   typedef type const_type;
 };
 
@@ -1743,26 +1739,6 @@
   return e.idx;
 }
 
-// Support for bundled properties
-template<BOOST_CSR_GRAPH_TEMPLATE_PARMS, typename T, typename Bundle>
-struct property_map<BOOST_CSR_GRAPH_TYPE, T Bundle::*>
-{
-private:
- typedef graph_traits<BOOST_CSR_GRAPH_TYPE> traits;
- typedef VertexProperty vertex_bundled;
- typedef EdgeProperty edge_bundled;
- typedef typename mpl::if_c<(detail::is_vertex_bundle<vertex_bundled, edge_bundled, Bundle>::value),
- typename traits::vertex_descriptor,
- typename traits::edge_descriptor>::type
- descriptor;
-
-public:
- typedef bundle_property_map<BOOST_CSR_GRAPH_TYPE, descriptor, Bundle, T>
- type;
- typedef bundle_property_map<const BOOST_CSR_GRAPH_TYPE, descriptor, Bundle,
- const T> const_type;
-};
-
 template<BOOST_CSR_GRAPH_TEMPLATE_PARMS, typename T, typename Bundle>
 inline
 typename property_map<BOOST_CSR_GRAPH_TYPE, T Bundle::*>::type

Modified: branches/release/status/explicit-failures-markup.xml
==============================================================================
--- branches/release/status/explicit-failures-markup.xml (original)
+++ branches/release/status/explicit-failures-markup.xml 2009-08-01 22:46:12 EDT (Sat, 01 Aug 2009)
@@ -1882,17 +1882,6 @@
             <note author="Jim Douglas" date="18 Feb 06" refid="27"/>
         </mark-expected-failures>
         <mark-expected-failures>
- <test name="csr_graph_test"/>
- <toolset name="msvc-8.0"/>
- <toolset name="msvc-8.0_64"/>
- <toolset name="msvc-8.0_x86_64"/>
- <toolset name="msvc-9.0"/>
- <note author="Doug Gregor">
- This failure is due to a problem with partial ordering
- of class template partial specializations.
- </note>
- </mark-expected-failures>
- <mark-expected-failures>
             <test name="dijkstra_heap_performance"/>
             <test name="layout_test"/>
             <test name="relaxed_heap_test"/>


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