[Boost-commit] svn:boost r85472 - in trunk: boost/graph libs/graph_parallel/test

Subject: [Boost-commit] svn:boost r85472 - in trunk: boost/graph libs/graph_parallel/test
From: jewillco_at_[hidden]
Date: 2013-08-26 00:11:49

Author: jewillco
Date: 2013-08-26 00:11:49 EDT (Mon, 26 Aug 2013)
New Revision: 85472
URL: http://svn.boost.org/trac/boost/changeset/85472

Log:
Removed use of "void" as property type to avoid errors in Clang; added static assertion to prevent this use in the future (it is broken anyway)

Text files modified: 
   trunk/boost/graph/compressed_sparse_row_graph.hpp       |     5 +++++                                   
   trunk/libs/graph_parallel/test/distributed_csr_test.cpp |     4 ++--                                    
   2 files changed, 7 insertions(+), 2 deletions(-)

Modified: trunk/boost/graph/compressed_sparse_row_graph.hpp
==============================================================================
--- trunk/boost/graph/compressed_sparse_row_graph.hpp	Sun Aug 25 18:23:54 2013	(r85471)
+++ trunk/boost/graph/compressed_sparse_row_graph.hpp	2013-08-26 00:11:49 EDT (Mon, 26 Aug 2013)	(r85472)
@@ -192,6 +192,11 @@
                                             VertexProperty, Vertex, typed_identity_property_map<Vertex> >
     inherited_vertex_properties;
 
+  // Some tests to prevent use of "void" is a property type (as was done in some test cases):
+  BOOST_STATIC_ASSERT((!is_same<VertexProperty, void>::value));
+  BOOST_STATIC_ASSERT((!is_same<EdgeProperty, void>::value));
+  BOOST_STATIC_ASSERT((!is_same<GraphProperty, void>::value));
+
  public:
   // For Property Graph
   typedef GraphProperty graph_property_type;

Modified: trunk/libs/graph_parallel/test/distributed_csr_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_csr_test.cpp	Sun Aug 25 18:23:54 2013	(r85471)
+++ trunk/libs/graph_parallel/test/distributed_csr_test.cpp	2013-08-26 00:11:49 EDT (Mon, 26 Aug 2013)	(r85472)
@@ -35,7 +35,7 @@
 
 void concept_checks()
 {
-  typedef compressed_sparse_row_graph<directedS, void, void, no_property, 
+  typedef compressed_sparse_row_graph<directedS, no_property, no_property, no_property, 
                                       distributedS<mpi_process_group> >
     Digraph;
   typedef graph_traits<Digraph>::vertex_descriptor vertex_descriptor;
@@ -81,7 +81,7 @@
 
   concept_checks();
 
-  typedef compressed_sparse_row_graph<directedS, void, void, no_property, 
+  typedef compressed_sparse_row_graph<directedS, no_property, no_property, no_property, 
                                       distributedS<mpi_process_group> >
     Digraph;