Replace Boost::foreach dependency with range-based for

Author: georgthegreat

CMakeLists.txt

@@ -29,7 +29,6 @@ target_link_libraries(boost_graph
     Boost::conversion
     Boost::core
     Boost::detail
-    Boost::foreach
     Boost::function
     Boost::integer
     Boost::iterator

doc/incremental_components.html

@@ -142,7 +142,7 @@ <H3>Example</H3>
   print_graph(graph, get(boost::vertex_index, graph));
   std::cout << std::endl;
 
-  BOOST_FOREACH(Vertex current_vertex, vertices(graph)) {
+  for (Vertex current_vertex: vertices(graph)) {
     std::cout << "representative[" << current_vertex << "] = " <<
       ds.find_set(current_vertex) << std::endl;
   }
@@ -158,12 +158,11 @@ <H3>Example</H3>
   Components components(parent.begin(), parent.end());
 
   // Iterate through the component indices
-  BOOST_FOREACH(VertexIndex current_index, components) {
+  for (VertexIndex current_index: components) {
     std::cout << "component " << current_index << " contains: ";
 
     // Iterate through the child vertex indices for [current_index]
-    BOOST_FOREACH(VertexIndex child_index,
-                  components[current_index]) {
+    for (VertexIndex child_index: components[current_index]) {
       std::cout << child_index << " ";
     }
 

example/graph-thingie.cpp

@@ -11,7 +11,6 @@
 
 #include <boost/graph/graphviz.hpp>
 #include <boost/graph/adjacency_list.hpp>
-#include <boost/foreach.hpp>
 #include <string>
 #include <sstream>
 #include <cstdlib>
@@ -99,7 +98,7 @@ int main()
     cout << "graph " << get("name", dp, &graph) << " ("
          << get("identifier", dp, &graph) << ")\n\n";
 
-    BOOST_FOREACH (graph_t::vertex_descriptor v, vertices(graph))
+    for (graph_t::vertex_descriptor v: vertices(graph))
     {
         cout << "vertex " << get("node_id", dp, v) << " ("
              << get("label", dp, v) << ")\n";

example/incremental-components-eg.cpp

@@ -11,7 +11,6 @@
 #include <iostream>
 #include <vector>
 
-#include <boost/foreach.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/incremental_components.hpp>
 #include <boost/pending/disjoint_sets.hpp>
@@ -53,7 +52,7 @@ int main(int argc, char* argv[])
     ds.union_set(4, 0);
     ds.union_set(2, 5);
 
-    BOOST_FOREACH (Vertex current_vertex, vertices(graph))
+    for (Vertex current_vertex: vertices(graph))
     {
         std::cout << "representative[" << current_vertex
                   << "] = " << ds.find_set(current_vertex) << std::endl;
@@ -69,12 +68,12 @@ int main(int argc, char* argv[])
     Components components(parent.begin(), parent.end());
 
     // Iterate through the component indices
-    BOOST_FOREACH (VertexIndex component_index, components)
+    for (VertexIndex component_index: components)
     {
         std::cout << "component " << component_index << " contains: ";
 
         // Iterate through the child vertex indices for [component_index]
-        BOOST_FOREACH (VertexIndex child_index, components[component_index])
+        for (VertexIndex child_index: components[component_index])
         {
             std::cout << child_index << " ";
         }

example/incremental_components.cpp

@@ -10,7 +10,6 @@
 #include <iostream>
 #include <vector>
 
-#include <boost/foreach.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/graph_utility.hpp>
 #include <boost/graph/incremental_components.hpp>
@@ -86,7 +85,7 @@ int main(int argc, char* argv[])
     print_graph(graph, get(boost::vertex_index, graph));
     std::cout << std::endl;
 
-    BOOST_FOREACH (Vertex current_vertex, vertices(graph))
+    for (Vertex current_vertex: vertices(graph))
     {
         std::cout << "representative[" << current_vertex
                   << "] = " << ds.find_set(current_vertex) << std::endl;
@@ -103,12 +102,12 @@ int main(int argc, char* argv[])
     Components components(parent.begin(), parent.end());
 
     // Iterate through the component indices
-    BOOST_FOREACH (VertexIndex current_index, components)
+    for (VertexIndex current_index: components)
     {
         std::cout << "component " << current_index << " contains: ";
 
         // Iterate through the child vertex indices for [current_index]
-        BOOST_FOREACH (VertexIndex child_index, components[current_index])
+        for (VertexIndex child_index: components[current_index])
         {
             std::cout << child_index << " ";
         }

include/boost/graph/graphviz.hpp

@@ -34,7 +34,6 @@
 #include <boost/static_assert.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/xpressive/xpressive_static.hpp>
-#include <boost/foreach.hpp>
 
 namespace boost
 {
@@ -843,13 +842,13 @@ namespace detail
                     edge_permutation_from_sorting[temp[e]] = e;
                 }
                 typedef boost::tuple< id_t, bgl_vertex_t, id_t > v_prop;
-                BOOST_FOREACH (const v_prop& t, vertex_props)
+                for (const v_prop& t: vertex_props)
                 {
                     put(boost::get< 0 >(t), dp_, boost::get< 1 >(t),
                         boost::get< 2 >(t));
                 }
                 typedef boost::tuple< id_t, bgl_edge_t, id_t > e_prop;
-                BOOST_FOREACH (const e_prop& t, edge_props)
+                for (const e_prop& t: edge_props)
                 {
                     put(boost::get< 0 >(t), dp_,
                         edge_permutation_from_sorting[boost::get< 1 >(t)],

include/boost/graph/hawick_circuits.hpp

@@ -9,7 +9,6 @@
 
 #include <algorithm>
 #include <boost/assert.hpp>
-#include <boost/foreach.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/one_bit_color_map.hpp>
 #include <boost/graph/properties.hpp>
@@ -134,7 +133,7 @@ namespace hawick_circuits_detail
         // documented above.
         bool blocked_map_starts_all_unblocked() const
         {
-            BOOST_FOREACH (Vertex v, vertices(graph_))
+            for (Vertex v: vertices(graph_))
                 if (is_blocked(v))
                     return false;
             return true;
@@ -144,7 +143,7 @@ namespace hawick_circuits_detail
         // sharing data structures between iterations does not break the code.
         bool all_closed_rows_are_empty() const
         {
-            BOOST_FOREACH (typename ClosedMatrix::reference row, closed_)
+            for (const auto& row: closed_)
                 if (!row.empty())
                     return false;
             return true;

src/graphml.cpp

@@ -11,7 +11,6 @@
 //           Tiago de Paula Peixoto
 
 #define BOOST_GRAPH_SOURCE
-#include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/graph/graphml.hpp>
@@ -44,7 +43,7 @@ class graphml_reader
         using boost::property_tree::ptree;
         size_t current_idx = 0;
         bool is_first = is_root;
-        BOOST_FOREACH (const ptree::value_type& n, top)
+        for (const ptree::value_type& n: top)
         {
             if (n.first == "graph")
             {
@@ -54,7 +53,7 @@ class graphml_reader
                     if (is_first)
                     {
                         is_first = false;
-                        BOOST_FOREACH (const ptree::value_type& attr, n.second)
+                        for (const ptree::value_type& attr: n.second)
                         {
                             if (attr.first != "data")
                                 continue;
@@ -83,7 +82,7 @@ class graphml_reader
                 | boost::property_tree::xml_parser::trim_whitespace);
         ptree gml = pt.get_child(path("graphml"));
         // Search for attributes
-        BOOST_FOREACH (const ptree::value_type& child, gml)
+        for (const ptree::value_type& child: gml)
         {
             if (child.first != "key")
                 continue;
@@ -127,17 +126,17 @@ class graphml_reader
         std::vector< const ptree* > graphs;
         handle_graph();
         get_graphs(gml, desired_idx, true, graphs);
-        BOOST_FOREACH (const ptree* gr, graphs)
+        for (const ptree* gr: graphs)
         {
             // Search for nodes
-            BOOST_FOREACH (const ptree::value_type& node, *gr)
+            for (const ptree::value_type& node: *gr)
             {
                 if (node.first != "node")
                     continue;
                 std::string id
                     = node.second.get< std::string >(path("<xmlattr>/id"));
                 handle_vertex(id);
-                BOOST_FOREACH (const ptree::value_type& attr, node.second)
+                for (const ptree::value_type& attr: node.second)
                 {
                     if (attr.first != "data")
                         continue;
@@ -148,13 +147,13 @@ class graphml_reader
                 }
             }
         }
-        BOOST_FOREACH (const ptree* gr, graphs)
+        for (const ptree* gr: graphs)
         {
             bool default_directed
                 = gr->get< std::string >(path("<xmlattr>/edgedefault"))
                 == "directed";
             // Search for edges
-            BOOST_FOREACH (const ptree::value_type& edge, *gr)
+            for (const ptree::value_type& edge: *gr)
             {
                 if (edge.first != "edge")
                     continue;
@@ -180,7 +179,7 @@ class graphml_reader
                 }
                 size_t old_edges_size = m_edge.size();
                 handle_edge(source, target);
-                BOOST_FOREACH (const ptree::value_type& attr, edge.second)
+                for (const ptree::value_type& attr: edge.second)
                 {
                     if (attr.first != "data")
                         continue;

test/grid_graph_test.cpp

@@ -12,7 +12,6 @@
 #include <set>
 #include <ctime>
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/graph/grid_graph.hpp>
 #include <boost/random.hpp>
@@ -100,7 +99,7 @@ template < unsigned int Dims > void do_test(minstd_rand& generator)
 
     // Verify all vertices are within bounds
     vertices_size_type vertex_count = 0;
-    BOOST_FOREACH (vertex_descriptor current_vertex, vertices(graph))
+    for (vertex_descriptor current_vertex: vertices(graph))
     {
 
         vertices_size_type current_index
@@ -118,8 +117,7 @@ template < unsigned int Dims > void do_test(minstd_rand& generator)
         edges_size_type out_edge_count = 0;
         std::set< vertices_size_type > target_vertices;
 
-        BOOST_FOREACH (
-            edge_descriptor out_edge, out_edges(current_vertex, graph))
+        for (edge_descriptor out_edge: out_edges(current_vertex, graph))
         {
 
             target_vertices.insert(
@@ -133,7 +131,7 @@ template < unsigned int Dims > void do_test(minstd_rand& generator)
         // Verify in-edges of this vertex
         edges_size_type in_edge_count = 0;
 
-        BOOST_FOREACH (edge_descriptor in_edge, in_edges(current_vertex, graph))
+        for (edge_descriptor in_edge: in_edges(current_vertex, graph))
         {
 
             BOOST_TEST(target_vertices.count(get(boost::vertex_index, graph,
@@ -153,7 +151,7 @@ template < unsigned int Dims > void do_test(minstd_rand& generator)
         // Verify adjacent vertices to this vertex
         vertices_size_type adjacent_count = 0;
 
-        BOOST_FOREACH (vertex_descriptor adjacent_vertex,
+        for (vertex_descriptor adjacent_vertex:
             adjacent_vertices(current_vertex, graph))
         {
 
@@ -168,7 +166,7 @@ template < unsigned int Dims > void do_test(minstd_rand& generator)
 
         // Verify that this vertex is not listed as connected to any
         // vertices outside of its adjacent vertices.
-        BOOST_FOREACH (vertex_descriptor unconnected_vertex, vertices(graph))
+        for (vertex_descriptor unconnected_vertex: vertices(graph))
         {
 
             vertices_size_type unconnected_index
@@ -193,7 +191,7 @@ template < unsigned int Dims > void do_test(minstd_rand& generator)
 
     // Verify all edges are within bounds
     edges_size_type edge_count = 0;
-    BOOST_FOREACH (edge_descriptor current_edge, edges(graph))
+    for (edge_descriptor current_edge: edges(graph))
     {
 
         vertices_size_type source_index

test/incremental_components_test.cpp

@@ -12,7 +12,6 @@
 #include <set>
 #include <ctime>
 
-#include <boost/foreach.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/incremental_components.hpp>
 #include <boost/graph/random.hpp>
@@ -69,20 +68,19 @@ template < typename Graph > void test_graph(const Graph& graph)
     // Create a reverse-lookup map for vertex indices
     std::vector< vertex_descriptor > reverse_index_map(num_vertices(graph));
 
-    BOOST_FOREACH (vertex_descriptor vertex, vertices(graph))
+    for (vertex_descriptor vertex: vertices(graph))
     {
         reverse_index_map[get(get(boost::vertex_index, graph), vertex)]
             = vertex;
     }
 
     // Verify that components are really connected
-    BOOST_FOREACH (vertices_size_type component_index, vertex_components)
+    for (vertices_size_type component_index: vertex_components)
     {
 
         std::set< vertex_descriptor > component_vertices;
 
-        BOOST_FOREACH (
-            vertices_size_type child_index, vertex_components[component_index])
+        for (vertices_size_type child_index: vertex_components[component_index])
         {
 
             vertex_descriptor child_vertex = reverse_index_map[child_index];
@@ -92,7 +90,7 @@ template < typename Graph > void test_graph(const Graph& graph)
 
         // Verify that children are connected to each other in some
         // manner, but not to vertices outside their component.
-        BOOST_FOREACH (vertex_descriptor child_vertex, component_vertices)
+        for (vertex_descriptor child_vertex: component_vertices)
         {
 
             // Skip orphan vertices
@@ -105,8 +103,7 @@ template < typename Graph > void test_graph(const Graph& graph)
             // another vertex in the component.
             bool edge_exists = false;
 
-            BOOST_FOREACH (
-                edge_descriptor child_edge, out_edges(child_vertex, graph))
+            for (edge_descriptor child_edge: out_edges(child_vertex, graph))
             {
 
                 if (component_vertices.count(target(child_edge, graph)) > 0)
@@ -162,7 +159,7 @@ int main(int argc, char* argv[])
 
     // Assign indices to list_graph's vertices
     graph_traits< ListGraph >::vertices_size_type index = 0;
-    BOOST_FOREACH (graph_traits< ListGraph >::vertex_descriptor vertex,
+    for (graph_traits< ListGraph >::vertex_descriptor vertex:
         vertices(list_graph))
     {
         put(get(boost::vertex_index, list_graph), vertex, index++);