diff options
Diffstat (limited to 'boost/graph/breadth_first_search.hpp')
| -rw-r--r-- | boost/graph/breadth_first_search.hpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/boost/graph/breadth_first_search.hpp b/boost/graph/breadth_first_search.hpp index 18bc24f5cf..b0d10ad5f3 100644 --- a/boost/graph/breadth_first_search.hpp +++ b/boost/graph/breadth_first_search.hpp @@ -64,7 +64,6 @@ namespace boost { BOOST_CONCEPT_ASSERT(( IncidenceGraphConcept<IncidenceGraph> )); typedef graph_traits<IncidenceGraph> GTraits; typedef typename GTraits::vertex_descriptor Vertex; - typedef typename GTraits::edge_descriptor Edge; BOOST_CONCEPT_ASSERT(( BFSVisitorConcept<BFSVisitor, IncidenceGraph> )); BOOST_CONCEPT_ASSERT(( ReadWritePropertyMapConcept<ColorMap, Vertex> )); typedef typename property_traits<ColorMap>::value_type ColorValue; @@ -248,8 +247,7 @@ namespace boost { ColorMap color, BFSVisitor vis, const bgl_named_params<P, T, R>& params, - BOOST_GRAPH_ENABLE_IF_MODELS(VertexListGraph, vertex_list_graph_tag, - void)* = 0) + boost::mpl::false_) { typedef graph_traits<VertexListGraph> Traits; // Buffer default @@ -271,8 +269,7 @@ namespace boost { ColorMap color, BFSVisitor vis, const bgl_named_params<P, T, R>& params, - BOOST_GRAPH_ENABLE_IF_MODELS(DistributedGraph, distributed_graph_tag, - void)* = 0); + boost::mpl::true_); #endif // BOOST_GRAPH_USE_MPI //------------------------------------------------------------------------- @@ -293,7 +290,11 @@ namespace boost { (g, s, color, choose_param(get_param(params, graph_visitor), make_bfs_visitor(null_visitor())), - params); + params, + boost::mpl::bool_< + boost::is_base_and_derived< + distributed_graph_tag, + typename graph_traits<VertexListGraph>::traversal_category>::value>()); } }; @@ -316,7 +317,11 @@ namespace boost { g, vertex_index)), choose_param(get_param(params, graph_visitor), make_bfs_visitor(null_vis)), - params); + params, + boost::mpl::bool_< + boost::is_base_and_derived< + distributed_graph_tag, + typename graph_traits<VertexListGraph>::traversal_category>::value>()); } }; |