update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / graph / make_connected.hpp

diff --git a/ceph/src/boost/boost/graph/make_connected.hpp b/ceph/src/boost/boost/graph/make_connected.hpp
index a2f8b1ee48b4f93eadd5cd60c06b804b7c71cc78..de3659067337960a968a6d73ab085f8f3f94e8f9 100644 (file)
--- a/ceph/src/boost/boost/graph/make_connected.hpp
+++ b/ceph/src/boost/boost/graph/make_connected.hpp
@@ -10,7 +10,7 @@
 
 #include <boost/config.hpp>
 #include <boost/next_prior.hpp>
-#include <boost/tuple/tuple.hpp>   //for tie
+#include <boost/tuple/tuple.hpp> //for tie
 #include <boost/graph/connected_components.hpp>
 #include <boost/property_map/property_map.hpp>
 #include <vector>
@@ -18,82 +18,62 @@
 #include <boost/graph/planar_detail/add_edge_visitors.hpp>
 #include <boost/graph/planar_detail/bucket_sort.hpp>
 
-
 namespace boost
 {
 
-
-  template <typename Graph,
-            typename VertexIndexMap,
-            typename AddEdgeVisitor
-            >
-  void make_connected(Graph& g, VertexIndexMap vm, AddEdgeVisitor& vis)
-  {
-    typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator_t;
-    typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
-    typedef typename graph_traits<Graph>::vertices_size_type v_size_t;
-    typedef iterator_property_map< typename std::vector<v_size_t>::iterator,
-                                   VertexIndexMap
-                                  > vertex_to_v_size_map_t;
-
-    std::vector<v_size_t> component_vector(num_vertices(g));
+template < typename Graph, typename VertexIndexMap, typename AddEdgeVisitor >
+void make_connected(Graph& g, VertexIndexMap vm, AddEdgeVisitor& vis)
+{
+    typedef typename graph_traits< Graph >::vertex_iterator vertex_iterator_t;
+    typedef typename graph_traits< Graph >::vertex_descriptor vertex_t;
+    typedef typename graph_traits< Graph >::vertices_size_type v_size_t;
+    typedef iterator_property_map< typename std::vector< v_size_t >::iterator,
+        VertexIndexMap >
+        vertex_to_v_size_map_t;
+
+    std::vector< v_size_t > component_vector(num_vertices(g));
     vertex_to_v_size_map_t component(component_vector.begin(), vm);
-    std::vector<vertex_t> vertices_by_component(num_vertices(g));
+    std::vector< vertex_t > vertices_by_component(num_vertices(g));
 
     v_size_t num_components = connected_components(g, component);
 
     if (num_components < 2)
-      return;
+        return;
 
     vertex_iterator_t vi, vi_end;
-    boost::tie(vi,vi_end) = vertices(g);
+    boost::tie(vi, vi_end) = vertices(g);
     std::copy(vi, vi_end, vertices_by_component.begin());
 
-    bucket_sort(vertices_by_component.begin(),
-                vertices_by_component.end(),
-                component,
-                num_components
-                );
+    bucket_sort(vertices_by_component.begin(), vertices_by_component.end(),
+        component, num_components);
 
-    typedef typename std::vector<vertex_t>::iterator vec_of_vertices_itr_t;
+    typedef typename std::vector< vertex_t >::iterator vec_of_vertices_itr_t;
 
     vec_of_vertices_itr_t ci_end = vertices_by_component.end();
     vec_of_vertices_itr_t ci_prev = vertices_by_component.begin();
     if (ci_prev == ci_end)
-      return;
+        return;
 
-    for(vec_of_vertices_itr_t ci = boost::next(ci_prev); 
-        ci != ci_end;  ci_prev = ci, ++ci
-        )
-      {
+    for (vec_of_vertices_itr_t ci = boost::next(ci_prev); ci != ci_end;
+         ci_prev = ci, ++ci)
+    {
         if (component[*ci_prev] != component[*ci])
-          vis.visit_vertex_pair(*ci_prev, *ci, g);
-      }
-
-  }
+            vis.visit_vertex_pair(*ci_prev, *ci, g);
+    }
+}
 
-
-
-
-  template <typename Graph, typename VertexIndexMap>
-  inline void make_connected(Graph& g, VertexIndexMap vm)
-  {
+template < typename Graph, typename VertexIndexMap >
+inline void make_connected(Graph& g, VertexIndexMap vm)
+{
     default_add_edge_visitor vis;
     make_connected(g, vm, vis);
-  }
-
-
-
-
-  template <typename Graph>
-  inline void make_connected(Graph& g)
-  {
-    make_connected(g, get(vertex_index,g));
-  }
-
-
+}
 
+template < typename Graph > inline void make_connected(Graph& g)
+{
+    make_connected(g, get(vertex_index, g));
+}
 
-} // namespace boost 
+} // namespace boost
 
 #endif //__MAKE_CONNECTED_HPP__