[Boost-commit] svn:boost r84913 - in trunk/boost/graph: . distributed

Subject: [Boost-commit] svn:boost r84913 - in trunk/boost/graph: . distributed
From: jewillco_at_[hidden]
Date: 2013-06-28 14:47:31

Author: jewillco
Date: 2013-06-28 14:47:30 EDT (Fri, 28 Jun 2013)
New Revision: 84913
URL: http://svn.boost.org/trac/boost/changeset/84913

Log:
Changed dispatching strategy for bfs_helper

Text files modified: 
   trunk/boost/graph/breadth_first_search.hpp             |    18 ++++++++++++------                      
   trunk/boost/graph/distributed/breadth_first_search.hpp |     3 +--                                     
   2 files changed, 13 insertions(+), 8 deletions(-)

Modified: trunk/boost/graph/breadth_first_search.hpp
==============================================================================
--- trunk/boost/graph/breadth_first_search.hpp	Fri Jun 28 14:47:10 2013	(r84912)
+++ trunk/boost/graph/breadth_first_search.hpp	2013-06-28 14:47:30 EDT (Fri, 28 Jun 2013)	(r84913)
@@ -248,8 +248,7 @@
        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 +270,7 @@
        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 +291,11 @@
           (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 +318,11 @@
                               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>());
       }
     };
 

Modified: trunk/boost/graph/distributed/breadth_first_search.hpp
==============================================================================
--- trunk/boost/graph/distributed/breadth_first_search.hpp	Fri Jun 28 14:47:10 2013	(r84912)
+++ trunk/boost/graph/distributed/breadth_first_search.hpp	2013-06-28 14:47:30 EDT (Fri, 28 Jun 2013)	(r84913)
@@ -151,8 +151,7 @@
        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_)
         {
             parallel_bfs_helper
         (g, s, color, vis, get_param(params, buffer_param_t()),