diff --git a/example/accum-compile-times.cpp b/example/accum-compile-times.cpp index 0cc66b60..385d86c9 100644 --- a/example/accum-compile-times.cpp +++ b/example/accum-compile-times.cpp @@ -85,14 +85,14 @@ main() std::ifstream name_in("makefile-target-names.dat"); std::ifstream compile_cost_in("target-compile-costs.dat"); graph_traits < file_dep_graph2 >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { name_in >> name_map[*vi]; compile_cost_in >> compile_cost_map[*vi]; } graph_property_iter_range < file_dep_graph2, vertex_compile_cost_t >::iterator ci, ci_end; - tie(ci, ci_end) = get_property_iter_range(g, vertex_compile_cost); + boost::tie(ci, ci_end) = get_property_iter_range(g, vertex_compile_cost); std::cout << "total (sequential) compile time: " << std::accumulate(ci, ci_end, 0.0) << std::endl; diff --git a/example/astar-cities.cpp b/example/astar-cities.cpp index a2a11544..d5affd11 100644 --- a/example/astar-cities.cpp +++ b/example/astar-cities.cpp @@ -164,8 +164,8 @@ int main(int argc, char **argv) WeightMap weightmap = get(edge_weight, g); for(std::size_t j = 0; j < num_edges; ++j) { edge_descriptor e; bool inserted; - tie(e, inserted) = add_edge(edge_array[j].first, - edge_array[j].second, g); + boost::tie(e, inserted) = add_edge(edge_array[j].first, + edge_array[j].second, g); weightmap[e] = weights[j]; } diff --git a/example/bellman-example.cpp b/example/bellman-example.cpp index 4e0b27d3..e6ec8750 100644 --- a/example/bellman-example.cpp +++ b/example/bellman-example.cpp @@ -74,7 +74,7 @@ main() property_map::type weight_pmap = get(&EdgeProperties::weight, g); int i = 0; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei, ++i) + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei, ++i) weight_pmap[*ei] = weight[i]; std::vector distance(N, (std::numeric_limits < short >::max)()); @@ -108,7 +108,7 @@ main() << " edge[style=\"bold\"]\n" << " node[shape=\"circle\"]\n"; { - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { graph_traits < Graph >::edge_descriptor e = *ei; graph_traits < Graph >::vertex_descriptor u = source(e, g), v = target(e, g); diff --git a/example/bfs-example2.cpp b/example/bfs-example2.cpp index ca8e8774..8225327e 100644 --- a/example/bfs-example2.cpp +++ b/example/bfs-example2.cpp @@ -78,7 +78,7 @@ main() std::vector < Size > dtime(num_vertices(g)); graph_traits::vertex_iterator vi, vi_end; std::size_t c = 0; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi, ++c) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi, ++c) dtime[c] = dtime_map[*vi]; // Use std::sort to order the vertices by their discover time diff --git a/example/bfs-name-printer.cpp b/example/bfs-name-printer.cpp index eba6dc43..aab408d9 100644 --- a/example/bfs-name-printer.cpp +++ b/example/bfs-name-printer.cpp @@ -32,19 +32,19 @@ build_router_network(Graph & g, VertexNameMap name_map, typename graph_traits::edge_descriptor ed; bool inserted; - tie(ed, inserted) = add_edge(a, b, g); + boost::tie(ed, inserted) = add_edge(a, b, g); delay_map[ed] = 1.2; - tie(ed, inserted) = add_edge(a, d, g); + boost::tie(ed, inserted) = add_edge(a, d, g); delay_map[ed] = 4.5; - tie(ed, inserted) = add_edge(b, d, g); + boost::tie(ed, inserted) = add_edge(b, d, g); delay_map[ed] = 1.8; - tie(ed, inserted) = add_edge(c, a, g); + boost::tie(ed, inserted) = add_edge(c, a, g); delay_map[ed] = 2.6; - tie(ed, inserted) = add_edge(c, e, g); + boost::tie(ed, inserted) = add_edge(c, e, g); delay_map[ed] = 5.2; - tie(ed, inserted) = add_edge(d, c, g); + boost::tie(ed, inserted) = add_edge(d, c, g); delay_map[ed] = 0.4; - tie(ed, inserted) = add_edge(d, e, g); + boost::tie(ed, inserted) = add_edge(d, e, g); delay_map[ed] = 3.3; } diff --git a/example/biconnected_components.cpp b/example/biconnected_components.cpp index e05d32e3..0406dcba 100644 --- a/example/biconnected_components.cpp +++ b/example/biconnected_components.cpp @@ -63,7 +63,7 @@ main() } graph_traits < graph_t >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) std::cout << (char)(source(*ei, g) + 'A') << " -- " << (char)(target(*ei, g) + 'A') << "[label=\"" << component[*ei] << "\"]\n"; diff --git a/example/bipartite_example.cpp b/example/bipartite_example.cpp index b1a912e8..05dd9cd8 100644 --- a/example/bipartite_example.cpp +++ b/example/bipartite_example.cpp @@ -41,7 +41,7 @@ void print_bipartite (const Graph& g) is_bipartite (g, get (vertex_index, g), partition_map); - for (tie (vertex_iter, vertex_end) = vertices (g); vertex_iter != vertex_end; ++vertex_iter) + for (boost::tie (vertex_iter, vertex_end) = vertices (g); vertex_iter != vertex_end; ++vertex_iter) { std::cout << "Vertex " << *vertex_iter << " has color " << (get (partition_map, *vertex_iter) == color_traits < default_color_type>::white () ? "white" : "black") << std::endl; diff --git a/example/boost_web_graph.cpp b/example/boost_web_graph.cpp index eec82184..53da8263 100644 --- a/example/boost_web_graph.cpp +++ b/example/boost_web_graph.cpp @@ -116,7 +116,7 @@ main() std::list::iterator i = line_toks.begin(); - tie(pos, inserted) = name2vertex.insert(std::make_pair(*i, Vertex())); + boost::tie(pos, inserted) = name2vertex.insert(std::make_pair(*i, Vertex())); if (inserted) { u = add_vertex(g); put(node_name, u, *i); @@ -127,7 +127,7 @@ main() std::string hyperlink_name = *i++; - tie(pos, inserted) = name2vertex.insert(std::make_pair(*i, Vertex())); + boost::tie(pos, inserted) = name2vertex.insert(std::make_pair(*i, Vertex())); if (inserted) { v = add_vertex(g); put(node_name, v, *i); @@ -136,7 +136,7 @@ main() v = pos->second; Edge e; - tie(e, inserted) = add_edge(u, v, g); + boost::tie(e, inserted) = add_edge(u, v, g); if (inserted) { put(link_name, e, hyperlink_name); } @@ -170,7 +170,7 @@ main() std::cout << "Number of clicks from the home page: " << std::endl; Traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) std::cout << d_matrix[0][*vi] << "\t" << node_name[*vi] << std::endl; std::cout << std::endl; @@ -179,7 +179,7 @@ main() // Create storage for a mapping from vertices to their parents std::vector parent(num_vertices(g)); - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) parent[*vi] = *vi; // Do a BFS starting at the home page, recording the parent of each @@ -192,7 +192,7 @@ main() // Add all the search tree edges into a new graph Graph search_tree(num_vertices(g)); - tie(vi, vi_end) = vertices(g); + boost::tie(vi, vi_end) = vertices(g); ++vi; for (; vi != vi_end; ++vi) add_edge(parent[*vi], *vi, search_tree); @@ -205,7 +205,7 @@ main() std::vector dfs_distances(num_vertices(g), 0); print_tree_visitor tree_printer(node_name, &dfs_distances[0]); - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) get(vertex_color, g)[*vi] = white_color; depth_first_visit(search_tree, src, tree_printer, get(vertex_color, g)); diff --git a/example/boykov_kolmogorov-eg.cpp b/example/boykov_kolmogorov-eg.cpp index ff2bc2ba..dec3474f 100644 --- a/example/boykov_kolmogorov-eg.cpp +++ b/example/boykov_kolmogorov-eg.cpp @@ -101,8 +101,8 @@ int main() std::cout << "c flow values:" << std::endl; graph_traits < Graph >::vertex_iterator u_iter, u_end; graph_traits < Graph >::out_edge_iterator ei, e_end; - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) - for (tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) + for (boost::tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) if (capacity[*ei] > 0) std::cout << "f " << *u_iter << " " << target(*ei, g) << " " << (capacity[*ei] - residual_capacity[*ei]) << std::endl; diff --git a/example/cc-internet.cpp b/example/cc-internet.cpp index dbd29f0e..0f2d930b 100644 --- a/example/cc-internet.cpp +++ b/example/cc-internet.cpp @@ -30,7 +30,7 @@ main() std::string color[] = { "white", "gray", "black", "lightgray"}; graph_traits < GraphvizGraph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { vertex_attr_map[*vi]["color"] = color[component[*vi]]; vertex_attr_map[*vi]["style"] = "filled"; if (vertex_attr_map[*vi]["color"] == "black") diff --git a/example/copy-example.cpp b/example/copy-example.cpp index b2af240e..41a0178a 100644 --- a/example/copy-example.cpp +++ b/example/copy-example.cpp @@ -26,7 +26,7 @@ main() name_map = get(vertex_name, G); char name = 'a'; graph_traits < graph_t >::vertex_iterator v, v_end; - for (tie(v, v_end) = vertices(G); v != v_end; ++v, ++name) + for (boost::tie(v, v_end) = vertices(G); v != v_end; ++v, ++name) name_map[*v] = name; typedef std::pair < int, int >E; diff --git a/example/cycle-file-dep.cpp b/example/cycle-file-dep.cpp index 23a33b1f..b7b22fac 100644 --- a/example/cycle-file-dep.cpp +++ b/example/cycle-file-dep.cpp @@ -38,7 +38,7 @@ has_cycle_dfs(const file_dep_graph & g, vertex_t u, { color[u] = gray_color; graph_traits < file_dep_graph >::adjacency_iterator vi, vi_end; - for (tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi) if (color[*vi] == white_color) { if (has_cycle_dfs(g, *vi, color)) return true; // cycle detected, return immediately @@ -53,7 +53,7 @@ has_cycle(const file_dep_graph & g) { std::vector < default_color_type > color(num_vertices(g), white_color); graph_traits < file_dep_graph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) if (color[*vi] == white_color) if (has_cycle_dfs(g, *vi, &color[0])) return true; @@ -75,7 +75,7 @@ main() file_dep_graph g(n_vertices); while (input_begin != input_end) { size_type i, j; - tie(i, j) = *input_begin++; + boost::tie(i, j) = *input_begin++; add_edge(i, j, g); } #else @@ -85,7 +85,7 @@ main() std::vector < std::string > name(num_vertices(g)); std::ifstream name_in("makefile-target-names.dat"); graph_traits < file_dep_graph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) name_in >> name[*vi]; assert(has_cycle(g) == false); diff --git a/example/cycle-file-dep2.cpp b/example/cycle-file-dep2.cpp index 4f55da15..0b04ff41 100644 --- a/example/cycle-file-dep2.cpp +++ b/example/cycle-file-dep2.cpp @@ -42,7 +42,7 @@ dfs_v1(const file_dep_graph & g, vertex_t u, default_color_type * color, color[u] = gray_color; vis.discover_vertex(u, g); graph_traits < file_dep_graph >::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { if (color[target(*ei, g)] == white_color) { vis.tree_edge(*ei, g); dfs_v1(g, target(*ei, g), color, vis); @@ -60,7 +60,7 @@ generic_dfs_v1(const file_dep_graph & g, Visitor vis) { std::vector < default_color_type > color(num_vertices(g), white_color); graph_traits < file_dep_graph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { if (color[*vi] == white_color) dfs_v1(g, *vi, &color[0], vis); } @@ -132,7 +132,7 @@ main() file_dep_graph g(n_vertices); while (input_begin != input_end) { size_type i, j; - tie(i, j) = *input_begin++; + boost::tie(i, j) = *input_begin++; add_edge(i, j, g); } #else @@ -142,7 +142,7 @@ main() std::vector < std::string > name(num_vertices(g)); std::ifstream name_in("makefile-target-names.dat"); graph_traits < file_dep_graph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) name_in >> name[*vi]; assert(has_cycle(g) == false); diff --git a/example/cycle_ratio_example.cpp b/example/cycle_ratio_example.cpp index 68846456..b65fdead 100644 --- a/example/cycle_ratio_example.cpp +++ b/example/cycle_ratio_example.cpp @@ -60,7 +60,7 @@ int main(int argc, char* argv[]) cout << "Edges number: " << num_edges(tgr) << endl; int i = 0; graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(tgr); vi != vi_end; vi++) { + for (boost::tie(vi, vi_end) = vertices(tgr); vi != vi_end; vi++) { vim[*vi] = i++; ///Initialize vertex index property } max_cr = maximum_cycle_ratio(tgr, vim, ew1, ew2); diff --git a/example/dag_shortest_paths.cpp b/example/dag_shortest_paths.cpp index b86896f1..97140c8e 100644 --- a/example/dag_shortest_paths.cpp +++ b/example/dag_shortest_paths.cpp @@ -60,7 +60,7 @@ int main() #endif graph_traits::vertex_iterator vi , vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) if (d_map[*vi] == (std::numeric_limits::max)()) std::cout << name[*vi] << ": inifinity\n"; else diff --git a/example/dfs-parenthesis.cpp b/example/dfs-parenthesis.cpp index e3426417..1078f90b 100644 --- a/example/dfs-parenthesis.cpp +++ b/example/dfs-parenthesis.cpp @@ -36,7 +36,7 @@ main() GraphvizGraph g; read_graphviz("figs/dfs-example.dot", g); graph_traits < GraphvizGraph >::edge_iterator e, e_end; - for (tie(e, e_end) = edges(g); e != e_end; ++e) + for (boost::tie(e, e_end) = edges(g); e != e_end; ++e) std::cout << '(' << name[source(*e, g)] << ' ' << name[target(*e, g)] << ')' << std::endl; parenthesis_visitor diff --git a/example/dijkstra-example-listS.cpp b/example/dijkstra-example-listS.cpp index 775bcc2e..1c934207 100644 --- a/example/dijkstra-example-listS.cpp +++ b/example/dijkstra-example-listS.cpp @@ -43,13 +43,13 @@ main(int, char *[]) property_map::type weightmap = get(edge_weight, g); std::vector msvc_vertices; - for (tie(i, iend) = vertices(g); i != iend; ++i) + for (boost::tie(i, iend) = vertices(g); i != iend; ++i) msvc_vertices.push_back(*i); for (std::size_t j = 0; j < num_arcs; ++j) { edge_descriptor e; bool inserted; - tie(e, inserted) = add_edge(msvc_vertices[edge_array[j].first], - msvc_vertices[edge_array[j].second], g); + boost::tie(e, inserted) = add_edge(msvc_vertices[edge_array[j].first], + msvc_vertices[edge_array[j].second], g); weightmap[e] = weights[j]; } @@ -62,7 +62,7 @@ main(int, char *[]) property_map::type indexmap = get(vertex_index, g); property_map::type name = get(vertex_name, g); int c = 0; - for (tie(i, iend) = vertices(g); i != iend; ++i, ++c) { + for (boost::tie(i, iend) = vertices(g); i != iend; ++i, ++c) { indexmap[*i] = c; name[*i] = 'A' + c; } @@ -86,7 +86,7 @@ main(int, char *[]) std::cout << "distances and parents:" << std::endl; graph_traits < graph_t >::vertex_iterator vi, vend; - for (tie(vi, vend) = vertices(g); vi != vend; ++vi) { + for (boost::tie(vi, vend) = vertices(g); vi != vend; ++vi) { std::cout << "distance(" << name[*vi] << ") = " << d[*vi] << ", "; std::cout << "parent(" << name[*vi] << ") = " << name[p[*vi]] << std:: endl; @@ -101,7 +101,7 @@ main(int, char *[]) << " edge[style=\"bold\"]\n" << " node[shape=\"circle\"]\n"; graph_traits < graph_t >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { graph_traits < graph_t >::edge_descriptor e = *ei; graph_traits < graph_t >::vertex_descriptor u = source(e, g), v = target(e, g); diff --git a/example/dijkstra-example.cpp b/example/dijkstra-example.cpp index f1a34d5a..6a77dded 100644 --- a/example/dijkstra-example.cpp +++ b/example/dijkstra-example.cpp @@ -37,7 +37,7 @@ main(int, char *[]) property_map::type weightmap = get(edge_weight, g); for (std::size_t j = 0; j < num_arcs; ++j) { edge_descriptor e; bool inserted; - tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g); + boost::tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g); weightmap[e] = weights[j]; } #else @@ -61,7 +61,7 @@ main(int, char *[]) std::cout << "distances and parents:" << std::endl; graph_traits < graph_t >::vertex_iterator vi, vend; - for (tie(vi, vend) = vertices(g); vi != vend; ++vi) { + for (boost::tie(vi, vend) = vertices(g); vi != vend; ++vi) { std::cout << "distance(" << name[*vi] << ") = " << d[*vi] << ", "; std::cout << "parent(" << name[*vi] << ") = " << name[p[*vi]] << std:: endl; @@ -77,7 +77,7 @@ main(int, char *[]) << " edge[style=\"bold\"]\n" << " node[shape=\"circle\"]\n"; graph_traits < graph_t >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { graph_traits < graph_t >::edge_descriptor e = *ei; graph_traits < graph_t >::vertex_descriptor u = source(e, g), v = target(e, g); diff --git a/example/dijkstra-no-color-map-example.cpp b/example/dijkstra-no-color-map-example.cpp index a52b9e31..cc89ab4f 100644 --- a/example/dijkstra-no-color-map-example.cpp +++ b/example/dijkstra-no-color-map-example.cpp @@ -41,7 +41,7 @@ main(int, char *[]) property_map::type weightmap = get(edge_weight, g); for (std::size_t j = 0; j < num_arcs; ++j) { edge_descriptor e; bool inserted; - tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g); + boost::tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g); weightmap[e] = weights[j]; } #else @@ -66,7 +66,7 @@ main(int, char *[]) std::cout << "distances and parents:" << std::endl; graph_traits < graph_t >::vertex_iterator vi, vend; - for (tie(vi, vend) = vertices(g); vi != vend; ++vi) { + for (boost::tie(vi, vend) = vertices(g); vi != vend; ++vi) { std::cout << "distance(" << name[*vi] << ") = " << d[*vi] << ", "; std::cout << "parent(" << name[*vi] << ") = " << name[p[*vi]] << std:: endl; @@ -82,7 +82,7 @@ main(int, char *[]) << " edge[style=\"bold\"]\n" << " node[shape=\"circle\"]\n"; graph_traits < graph_t >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { graph_traits < graph_t >::edge_descriptor e = *ei; graph_traits < graph_t >::vertex_descriptor u = source(e, g), v = target(e, g); diff --git a/example/eccentricity.cpp b/example/eccentricity.cpp index c49c2825..3e16e6f2 100644 --- a/example/eccentricity.cpp +++ b/example/eccentricity.cpp @@ -73,11 +73,11 @@ main(int argc, char *argv[]) int r, d; EccentricityContainer eccs(num_vertices(g)); EccentricityMap em(eccs, g); - tie(r, d) = all_eccentricities(g, dm, em); + boost::tie(r, d) = all_eccentricities(g, dm, em); // Print the closeness centrality of each vertex. graph_traits::vertex_iterator i, end; - for(tie(i, end) = vertices(g); i != end; ++i) { + for(boost::tie(i, end) = vertices(g); i != end; ++i) { cout << setw(12) << setiosflags(ios::left) << g[*i].name << get(em, *i) << endl; } diff --git a/example/edge-connectivity.cpp b/example/edge-connectivity.cpp index f51694e2..bd33ca72 100644 --- a/example/edge-connectivity.cpp +++ b/example/edge-connectivity.cpp @@ -24,7 +24,7 @@ namespace boost typedef typename graph_traits < Graph >::degree_size_type size_type; size_type delta = (std::numeric_limits < size_type >::max)(); typename graph_traits < Graph >::vertex_iterator i, iend; - for (tie(i, iend) = vertices(g); i != iend; ++i) + for (boost::tie(i, iend) = vertices(g); i != iend; ++i) if (degree(*i, g) < delta) { delta = degree(*i, g); @@ -39,7 +39,7 @@ namespace boost OutputIterator result) { typename graph_traits < Graph >::adjacency_iterator ai, aend; - for (tie(ai, aend) = adjacent_vertices(u, g); ai != aend; ++ai) + for (boost::tie(ai, aend) = adjacent_vertices(u, g); ai != aend; ++ai) *result++ = *ai; } template < typename Graph, typename VertexIterator, @@ -87,17 +87,17 @@ namespace boost rev_edge = get(edge_reverse, flow_g); typename graph_traits < VertexListGraph >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { u = source(*ei, g), v = target(*ei, g); - tie(e1, inserted) = add_edge(u, v, flow_g); + boost::tie(e1, inserted) = add_edge(u, v, flow_g); cap[e1] = 1; - tie(e2, inserted) = add_edge(v, u, flow_g); + boost::tie(e2, inserted) = add_edge(v, u, flow_g); cap[e2] = 1; rev_edge[e1] = e2; rev_edge[e2] = e1; } - tie(p, delta) = min_degree_vertex(g); + boost::tie(p, delta) = min_degree_vertex(g); S_star.push_back(p); alpha_star = delta; S.insert(p); @@ -115,7 +115,7 @@ namespace boost if (alpha_S_k < alpha_star) { alpha_star = alpha_S_k; S_star.clear(); - for (tie(vi, vi_end) = vertices(flow_g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(flow_g); vi != vi_end; ++vi) if (color[*vi] != Color::white()) S_star.push_back(*vi); } @@ -135,7 +135,7 @@ namespace boost degree_size_type c = 0; for (si = S_star.begin(); si != S_star.end(); ++si) { typename graph_traits < VertexListGraph >::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(*si, g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = out_edges(*si, g); ei != ei_end; ++ei) if (!in_S_star[target(*ei, g)]) { *disconnecting_set++ = *ei; ++c; diff --git a/example/edge-function.cpp b/example/edge-function.cpp index 48a0667b..6ee0b666 100644 --- a/example/edge-function.cpp +++ b/example/edge-function.cpp @@ -43,7 +43,7 @@ output_adjacent_vertices(std::ostream & out, { typename graph_traits < Graph >::adjacency_iterator vi, vi_end; out << get(name_map, u) << " -> { "; - for (tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi) out << get(name_map, *vi) << " "; out << "}" << std::endl; } @@ -108,7 +108,7 @@ main() name_map_t name = get(vertex_name, g); // Get iterators for the vertex set graph_traits < graph_type >::vertex_iterator i, end; - tie(i, end) = vertices(g); + boost::tie(i, end) = vertices(g); // Find yow.h name_equals_t < name_map_t > predicate1("yow.h", name); yow = *std::find_if(i, end, predicate1); @@ -123,13 +123,13 @@ main() bool exists; // Get the edge connecting yow.h to zag.o - tie(e1, exists) = edge(yow, zag, g); + boost::tie(e1, exists) = edge(yow, zag, g); assert(exists == true); assert(source(e1, g) == yow); assert(target(e1, g) == zag); // Discover that there is no edge connecting zag.o to bar.o - tie(e2, exists) = edge(zag, bar, g); + boost::tie(e2, exists) = edge(zag, bar, g); assert(exists == false); assert(num_vertices(g) == 15); diff --git a/example/edge_property.cpp b/example/edge_property.cpp index 5adac08e..3bfe575c 100644 --- a/example/edge_property.cpp +++ b/example/edge_property.cpp @@ -151,8 +151,8 @@ int main(int , char* []) boost::graph_traits::vertex_iterator v, v_end; boost::graph_traits::out_edge_iterator e, e_end; int f = 0; - for (tie(v, v_end) = vertices(G); v != v_end; ++v) - for (tie(e, e_end) = out_edges(*v, G); e != e_end; ++e) + for (boost::tie(v, v_end) = vertices(G); v != v_end; ++v) + for (boost::tie(e, e_end) = out_edges(*v, G); e != e_end; ++e) flow[*e] = ++f; cout << endl << endl; diff --git a/example/edmonds-karp-eg.cpp b/example/edmonds-karp-eg.cpp index 4b5c6fac..688cb674 100644 --- a/example/edmonds-karp-eg.cpp +++ b/example/edmonds-karp-eg.cpp @@ -80,8 +80,8 @@ main() std::cout << "c flow values:" << std::endl; graph_traits < Graph >::vertex_iterator u_iter, u_end; graph_traits < Graph >::out_edge_iterator ei, e_end; - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) - for (tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) + for (boost::tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) if (capacity[*ei] > 0) std::cout << "f " << *u_iter << " " << target(*ei, g) << " " << (capacity[*ei] - residual_capacity[*ei]) << std::endl; diff --git a/example/family-tree-eg.cpp b/example/family-tree-eg.cpp index ab2b0bcc..c3623935 100644 --- a/example/family-tree-eg.cpp +++ b/example/family-tree-eg.cpp @@ -34,9 +34,9 @@ main() property_map < adjacency_list <>, vertex_index_t >::type index_map = get(vertex_index, g); - for (tie(i, end) = vertices(g); i != end; ++i) { + for (boost::tie(i, end) = vertices(g); i != end; ++i) { std::cout << name[get(index_map, *i)]; - tie(ai, a_end) = adjacent_vertices(*i, g); + boost::tie(ai, a_end) = adjacent_vertices(*i, g); if (ai == a_end) std::cout << " has no children"; else diff --git a/example/file_dependencies.cpp b/example/file_dependencies.cpp index e96369ca..9bce7334 100644 --- a/example/file_dependencies.cpp +++ b/example/file_dependencies.cpp @@ -104,7 +104,7 @@ int main(int,char*[]) Graph g(N); for (std::size_t j = 0; j < nedges; ++j) { graph_traits::edge_descriptor e; bool inserted; - tie(e, inserted) = add_edge(used_by[j].first, used_by[j].second, g); + boost::tie(e, inserted) = add_edge(used_by[j].first, used_by[j].second, g); } #else Graph g(used_by, used_by + nedges, N); @@ -135,7 +135,7 @@ int main(int,char*[]) int maxdist=0; // Through the order from topological sort, we are sure that every // time we are using here is already initialized. - for (tie(j, j_end) = in_edges(*i, g); j != j_end; ++j) + for (boost::tie(j, j_end) = in_edges(*i, g); j != j_end; ++j) maxdist=(std::max)(time[source(*j, g)], maxdist); time[*i]=maxdist+1; } @@ -145,7 +145,7 @@ int main(int,char*[]) << "vertices with same group number can be made in parallel" << endl; { graph_traits::vertex_iterator i, iend; - for (tie(i,iend) = vertices(g); i != iend; ++i) + for (boost::tie(i,iend) = vertices(g); i != iend; ++i) cout << "time_slot[" << name[*i] << "] = " << time[*i] << endl; } diff --git a/example/filtered-copy-example.cpp b/example/filtered-copy-example.cpp index f1ee142b..d16dee2d 100644 --- a/example/filtered-copy-example.cpp +++ b/example/filtered-copy-example.cpp @@ -39,7 +39,7 @@ main() name_map = get(vertex_name, G); char name = 'a'; graph_traits < graph_t >::vertex_iterator v, v_end; - for (tie(v, v_end) = vertices(G); v != v_end; ++v, ++name) + for (boost::tie(v, v_end) = vertices(G); v != v_end; ++v, ++name) name_map[*v] = name; typedef std::pair < int, int >E; diff --git a/example/filtered_graph_edge_range.cpp b/example/filtered_graph_edge_range.cpp index 6a00789d..eb140f64 100644 --- a/example/filtered_graph_edge_range.cpp +++ b/example/filtered_graph_edge_range.cpp @@ -61,7 +61,7 @@ int main() std::cout << "unfiltered edge_range(C,D)\n"; graph_traits::out_edge_iterator f, l; - for (tie(f, l) = edge_range(C, D, g); f != l; ++f) + for (boost::tie(f, l) = edge_range(C, D, g); f != l; ++f) std::cout << name[source(*f, g)] << " --" << weight[*f] << "-> " << name[target(*f, g)] << "\n"; @@ -71,7 +71,7 @@ int main() std::cout << "filtered edge_range(C,D)\n"; graph_traits::out_edge_iterator first, last; - for (tie(first, last) = edge_range(C, D, fg); first != last; ++first) + for (boost::tie(first, last) = edge_range(C, D, fg); first != last; ++first) std::cout << name[source(*first, fg)] << " --" << weight[*first] << "-> " << name[target(*first, fg)] << "\n"; diff --git a/example/fr_layout.cpp b/example/fr_layout.cpp index 6fb8b733..2f7e4fea 100644 --- a/example/fr_layout.cpp +++ b/example/fr_layout.cpp @@ -128,7 +128,7 @@ int main(int argc, char* argv[]) cooling(progress_cooling(iterations))); graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { std::cout << get(vertex_name, g, *vi) << '\t' << position[*vi][0] << '\t' << position[*vi][1] << std::endl; } diff --git a/example/gerdemann.cpp b/example/gerdemann.cpp index d4b9fbaf..ceb8a235 100644 --- a/example/gerdemann.cpp +++ b/example/gerdemann.cpp @@ -46,13 +46,13 @@ void merge_vertex typedef boost::graph_traits Traits; typename Traits::edge_descriptor e; typename Traits::out_edge_iterator out_i, out_end; - for (tie(out_i, out_end) = out_edges(v, g); out_i != out_end; ++out_i) { + for (boost::tie(out_i, out_end) = out_edges(v, g); out_i != out_end; ++out_i) { e = *out_i; typename Traits::vertex_descriptor targ = target(e, g); add_edge(u, targ, getp(e), g); } typename Traits::in_edge_iterator in_i, in_end; - for (tie(in_i, in_end) = in_edges(v, g); in_i != in_end; ++in_i) { + for (boost::tie(in_i, in_end) = in_edges(v, g); in_i != in_end; ++in_i) { e = *in_i; typename Traits::vertex_descriptor src = source(e, g); add_edge(src, u, getp(e), g); diff --git a/example/graph-property-iter-eg.cpp b/example/graph-property-iter-eg.cpp index f471b0e0..0c11914a 100644 --- a/example/graph-property-iter-eg.cpp +++ b/example/graph-property-iter-eg.cpp @@ -23,11 +23,11 @@ main() const char *vertex_names[] = { "Kubrick", "Clark", "Hal" }; int i = 0; graph_property_iter_range < graph_t, vertex_name_t >::iterator v, v_end; - for (tie(v, v_end) = get_property_iter_range(g, vertex_name); + for (boost::tie(v, v_end) = get_property_iter_range(g, vertex_name); v != v_end; ++v, ++i) *v = vertex_names[i]; - tie(v, v_end) = get_property_iter_range(g, vertex_name); + boost::tie(v, v_end) = get_property_iter_range(g, vertex_name); std::copy(v, v_end, std::ostream_iterator < std::string > (std::cout, " ")); std::cout << std::endl; return 0; diff --git a/example/in_edges.cpp b/example/in_edges.cpp index cceb5538..f729c44d 100644 --- a/example/in_edges.cpp +++ b/example/in_edges.cpp @@ -43,9 +43,9 @@ int main(int , char* []) boost::graph_traits::vertex_iterator i, end; boost::graph_traits::in_edge_iterator ei, edge_end; - for(tie(i,end) = vertices(g); i != end; ++i) { + for(boost::tie(i,end) = vertices(g); i != end; ++i) { cout << *i << " <-- "; - for (tie(ei,edge_end) = in_edges(*i, g); ei != edge_end; ++ei) + for (boost::tie(ei,edge_end) = in_edges(*i, g); ei != edge_end; ++ei) cout << source(*ei, g) << " "; cout << endl; } diff --git a/example/isomorphism.cpp b/example/isomorphism.cpp index 8882f751..c11d70fa 100644 --- a/example/isomorphism.cpp +++ b/example/isomorphism.cpp @@ -35,12 +35,12 @@ main() graph_traits::vertex_iterator i, end; int id = 0; - for (tie(i, end) = vertices(g1); i != end; ++i, ++id) { + for (boost::tie(i, end) = vertices(g1); i != end; ++i, ++id) { put(v1_index_map, *i, id); v1[id] = *i; } id = 0; - for (tie(i, end) = vertices(g2); i != end; ++i, ++id) { + for (boost::tie(i, end) = vertices(g2); i != end; ++i, ++id) { put(v2_index_map, *i, id); v2[id] = *i; } diff --git a/example/johnson-eg.cpp b/example/johnson-eg.cpp index fa56081a..557b1733 100644 --- a/example/johnson-eg.cpp +++ b/example/johnson-eg.cpp @@ -73,7 +73,7 @@ main() << "edge[style=\"bold\"]\n" << "node[shape=\"circle\"]\n"; graph_traits < Graph >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) fout << source(*ei, g) << " -> " << target(*ei, g) << "[label=" << get(edge_weight, g)[*ei] << "]\n"; diff --git a/example/kevin-bacon.cpp b/example/kevin-bacon.cpp index 2678bb05..5b1dd8b5 100644 --- a/example/kevin-bacon.cpp +++ b/example/kevin-bacon.cpp @@ -74,7 +74,7 @@ main() NameVertexMap::iterator pos; bool inserted; Vertex u, v; - tie(pos, inserted) = actors.insert(std::make_pair(actors_name, Vertex())); + boost::tie(pos, inserted) = actors.insert(std::make_pair(actors_name, Vertex())); if (inserted) { u = add_vertex(g); actor_name[u] = actors_name; @@ -84,7 +84,7 @@ main() std::string movie_name = *i++; - tie(pos, inserted) = actors.insert(std::make_pair(*i, Vertex())); + boost::tie(pos, inserted) = actors.insert(std::make_pair(*i, Vertex())); if (inserted) { v = add_vertex(g); actor_name[v] = *i; @@ -93,7 +93,7 @@ main() v = pos->second; graph_traits < Graph >::edge_descriptor e; - tie(e, inserted) = add_edge(u, v, g); + boost::tie(e, inserted) = add_edge(u, v, g); if (inserted) connecting_movie[e] = movie_name; @@ -108,7 +108,7 @@ main() visitor(record_bacon_number(&bacon_number[0]))); graph_traits < Graph >::vertex_iterator i, end; - for (tie(i, end) = vertices(g); i != end; ++i) { + for (boost::tie(i, end) = vertices(g); i != end; ++i) { std::cout << actor_name[*i] << " has a Bacon number of " << bacon_number[*i] << std::endl; } diff --git a/example/kevin-bacon2.cpp b/example/kevin-bacon2.cpp index 719d24c6..79fb9a58 100644 --- a/example/kevin-bacon2.cpp +++ b/example/kevin-bacon2.cpp @@ -71,7 +71,7 @@ int main() // Get the vertex for Kevin Bacon Vertex src; graph_traits::vertex_iterator i, end; - for (tie(i, end) = vertices(g); i != end; ++i) + for (boost::tie(i, end) = vertices(g); i != end; ++i) if (g[*i].name == "Kevin Bacon") src = *i; @@ -82,7 +82,7 @@ int main() breadth_first_search(g, src, visitor(bacon_number_recorder(&bacon_number[0]))); - for (tie(i, end) = vertices(g); i != end; ++i) + for (boost::tie(i, end) = vertices(g); i != end; ++i) std::cout << g[*i].name << " has a Bacon number of " << bacon_number[*i] << std::endl; diff --git a/example/knights-tour.cpp b/example/knights-tour.cpp index bbd0d800..048cbde4 100644 --- a/example/knights-tour.cpp +++ b/example/knights-tour.cpp @@ -179,7 +179,7 @@ template < typename Graph, typename TimePropertyMap > S.push(std::make_pair(time_stamp, src)); while (!S.empty()) { Vertex x; - tie(time_stamp, x) = S.top(); + boost::tie(time_stamp, x) = S.top(); put(time_map, x, time_stamp); // all vertices have been visited, success! if (time_stamp == num_vertices(g) - 1) @@ -187,7 +187,7 @@ template < typename Graph, typename TimePropertyMap > bool deadend = true; typename graph_traits < Graph >::adjacency_iterator i, end; - for (tie(i, end) = adjacent_vertices(x, g); i != end; ++i) + for (boost::tie(i, end) = adjacent_vertices(x, g); i != end; ++i) if (get(time_map, *i) == -1) { S.push(std::make_pair(time_stamp + 1, *i)); deadend = false; @@ -196,11 +196,11 @@ template < typename Graph, typename TimePropertyMap > if (deadend) { put(time_map, x, -1); S.pop(); - tie(time_stamp, x) = S.top(); + boost::tie(time_stamp, x) = S.top(); while (get(time_map, x) != -1) { // unwind stack to last unexplored vertex put(time_map, x, -1); S.pop(); - tie(time_stamp, x) = S.top(); + boost::tie(time_stamp, x) = S.top(); } } @@ -213,7 +213,7 @@ number_of_successors(Vertex x, Graph & g, TimePropertyMap time_map) { int s_x = 0; typename graph_traits < Graph >::adjacency_iterator i, end; - for (tie(i, end) = adjacent_vertices(x, g); i != end; ++i) + for (boost::tie(i, end) = adjacent_vertices(x, g); i != end; ++i) if (get(time_map, *i) == -1) ++s_x; return s_x; @@ -232,7 +232,7 @@ template < typename Graph, typename TimePropertyMap > S.push(std::make_pair(time_stamp, src)); while (!S.empty()) { Vertex x; - tie(time_stamp, x) = S.top(); + boost::tie(time_stamp, x) = S.top(); put(time_map, x, time_stamp); // all vertices have been visited, success! if (time_stamp == num_vertices(g) - 1) @@ -242,7 +242,7 @@ template < typename Graph, typename TimePropertyMap > std::priority_queue < P, std::vector < P >, compare_first > Q; typename graph_traits < Graph >::adjacency_iterator i, end; int num_succ; - for (tie(i, end) = adjacent_vertices(x, g); i != end; ++i) + for (boost::tie(i, end) = adjacent_vertices(x, g); i != end; ++i) if (get(time_map, *i) == -1) { num_succ = number_of_successors(*i, g, time_map); Q.push(std::make_pair(num_succ, *i)); @@ -250,17 +250,17 @@ template < typename Graph, typename TimePropertyMap > bool deadend = Q.empty(); // move vertices from local priority queue to the stack for (; !Q.empty(); Q.pop()) { - tie(num_succ, x) = Q.top(); + boost::tie(num_succ, x) = Q.top(); S.push(std::make_pair(time_stamp + 1, x)); } if (deadend) { put(time_map, x, -1); S.pop(); - tie(time_stamp, x) = S.top(); + boost::tie(time_stamp, x) = S.top(); while (get(time_map, x) != -1) { // unwind stack to last unexplored vertex put(time_map, x, -1); S.pop(); - tie(time_stamp, x) = S.top(); + boost::tie(time_stamp, x) = S.top(); } } diff --git a/example/kruskal-example.cpp b/example/kruskal-example.cpp index 23d36057..ca27eb74 100644 --- a/example/kruskal-example.cpp +++ b/example/kruskal-example.cpp @@ -31,7 +31,7 @@ main() property_map::type weightmap = get(edge_weight, g); for (std::size_t j = 0; j < num_edges; ++j) { Edge e; bool inserted; - tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g); + boost::tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g); weightmap[e] = weights[j]; } #else @@ -57,7 +57,7 @@ main() << " ratio=\"filled\"\n" << " edge[style=\"bold\"]\n" << " node[shape=\"circle\"]\n"; graph_traits::edge_iterator eiter, eiter_end; - for (tie(eiter, eiter_end) = edges(g); eiter != eiter_end; ++eiter) { + for (boost::tie(eiter, eiter_end) = edges(g); eiter != eiter_end; ++eiter) { fout << source(*eiter, g) << " -- " << target(*eiter, g); if (std::find(spanning_tree.begin(), spanning_tree.end(), *eiter) != spanning_tree.end()) diff --git a/example/kruskal-telephone.cpp b/example/kruskal-telephone.cpp index 1a24e77f..7e53d70a 100644 --- a/example/kruskal-telephone.cpp +++ b/example/kruskal-telephone.cpp @@ -25,7 +25,7 @@ main() property_map < GraphvizGraph, edge_attribute_t >::type edge_attr_map = get(edge_attribute, g_dot); graph_traits < GraphvizGraph >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g_dot); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g_dot); ei != ei_end; ++ei) { int weight = lexical_cast < int >(edge_attr_map[*ei]["label"]); property < edge_weight_t, int >edge_property(weight); add_edge(source(*ei, g_dot), target(*ei, g_dot), edge_property, g); diff --git a/example/leda-graph-eg.cpp b/example/leda-graph-eg.cpp index 81449a66..4fddab84 100644 --- a/example/leda-graph-eg.cpp +++ b/example/leda-graph-eg.cpp @@ -22,7 +22,7 @@ main() typedef property_map < graph_t, vertex_all_t >::type NodeMap; NodeMap node_name_map = get(vertex_all, g); graph_traits < graph_t >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) std::cout << node_name_map[*vi] << std::endl; return EXIT_SUCCESS; } diff --git a/example/loops_dfs.cpp b/example/loops_dfs.cpp index 66855b88..c6babb1e 100644 --- a/example/loops_dfs.cpp +++ b/example/loops_dfs.cpp @@ -91,7 +91,7 @@ compute_loop_extent(typename graph_traits < get(vertex_index, g), c)); typename graph_traits < Graph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) if (reachable_from_head[*vi] != Color::white() && reachable_to_tail[*vi] != Color::white()) loop_set.insert(*vi); @@ -138,7 +138,7 @@ main(int argc, char *argv[]) vattr_map[*j]["color"] = "gray"; in_loop[*j] = true; } - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) if (in_loop[source(*ei, g)] && in_loop[target(*ei, g)]) eattr_map[*ei]["color"] = "gray"; } @@ -151,7 +151,7 @@ main(int argc, char *argv[]) << "ratio=\"fill\"\n" << "shape=\"box\"\n"; graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { loops_out << *vi << "["; for (std::map::iterator ai = vattr_map[*vi].begin(); ai != vattr_map[*vi].end(); ++ai) { @@ -162,7 +162,7 @@ main(int argc, char *argv[]) loops_out<< "]"; } - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { loops_out << source(*ei, g) << " -> " << target(*ei, g) << "["; std::map& attr_map = eattr_map[*ei]; for (std::map::iterator eai = attr_map.begin(); diff --git a/example/max_flow.cpp b/example/max_flow.cpp index 16a0c9ed..fc9f17c1 100644 --- a/example/max_flow.cpp +++ b/example/max_flow.cpp @@ -85,8 +85,8 @@ main() std::cout << "c flow values:" << std::endl; graph_traits::vertex_iterator u_iter, u_end; graph_traits::out_edge_iterator ei, e_end; - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) - for (tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) + for (boost::tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) if (capacity[*ei] > 0) std::cout << "f " << *u_iter << " " << target(*ei, g) << " " << (capacity[*ei] - residual_capacity[*ei]) << std::endl; diff --git a/example/min_max_paths.cpp b/example/min_max_paths.cpp index d9da0ff4..42a740b6 100644 --- a/example/min_max_paths.cpp +++ b/example/min_max_paths.cpp @@ -58,7 +58,7 @@ main(int , char* []) property_map::type weightmap = get(edge_weight, G); for (std::size_t j = 0; j < sizeof(edges) / sizeof(E); ++j) { graph_traits::edge_descriptor e; bool inserted; - tie(e, inserted) = add_edge(edges[j].first, edges[j].second, G); + boost::tie(e, inserted) = add_edge(edges[j].first, edges[j].second, G); weightmap[e] = weights[j]; } #else @@ -85,14 +85,14 @@ main(int , char* []) std::cout << "distances from start vertex:" << std::endl; graph_traits::vertex_iterator vi, vend; - for(tie(vi,vend) = vertices(G); vi != vend; ++vi) + for(boost::tie(vi,vend) = vertices(G); vi != vend; ++vi) std::cout << "distance(" << name[*vi] << ") = " << d[*vi] << std::endl; std::cout << std::endl; std::cout << "min-max paths tree" << std::endl; adjacency_list<> tree(num_nodes); - for(tie(vi,vend) = vertices(G); vi != vend; ++vi) + for(boost::tie(vi,vend) = vertices(G); vi != vend; ++vi) if (*vi != p[*vi]) add_edge(p[*vi], *vi, tree); diff --git a/example/modify_graph.cpp b/example/modify_graph.cpp index 4cd93306..42b668cb 100644 --- a/example/modify_graph.cpp +++ b/example/modify_graph.cpp @@ -86,7 +86,7 @@ void modify_demo(MutableGraph& g) u = add_vertex(g); v = add_vertex(g); - tie(e, added) = add_edge(u, v, g); + boost::tie(e, added) = add_edge(u, v, g); assert(num_edges(g) == m + 2); assert(added == true); // edge should have been added @@ -102,14 +102,14 @@ void modify_demo(MutableGraph& g) assert(num_edges(g) == m + 1); bool exists; - tie(e, exists) = edge(u, v, g); + boost::tie(e, exists) = edge(u, v, g); assert(exists == false); assert(out_degree(u, g) == 0); assert(in_degree(v, g) == 0); } { e = *edges(g).first; - tie(u, v) = incident(e, g); + boost::tie(u, v) = incident(e, g); remove_edge(e, g); @@ -121,7 +121,7 @@ void modify_demo(MutableGraph& g) add_edge(u, v, g); typename GraphTraits::out_edge_iterator iter, iter_end; - tie(iter, iter_end) = out_edges(u, g); + boost::tie(iter, iter_end) = out_edges(u, g); remove_edge(iter, g); @@ -131,13 +131,13 @@ void modify_demo(MutableGraph& g) } { w = add_vertex(g); - tie(e1, added) = add_edge(u, v, g); - tie(e2, added) = add_edge(v, w, g); + boost::tie(e1, added) = add_edge(u, v, g); + boost::tie(e2, added) = add_edge(v, w, g); name_map[e1] = "I-5"; name_map[e2] = "Route 66"; typename GraphTraits::out_edge_iterator iter, iter_end; - tie(iter, iter_end) = out_edges(u, g); + boost::tie(iter, iter_end) = out_edges(u, g); remove_edge_if(name_equals("Route 66", name_map), g); @@ -152,8 +152,8 @@ void modify_demo(MutableGraph& g) assert(in_degree(w, g) == 0); } { - tie(e1, added) = add_edge(u, v, g); - tie(e2, added) = add_edge(u, w, g); + boost::tie(e1, added) = add_edge(u, v, g); + boost::tie(e2, added) = add_edge(u, w, g); name_map[e1] = "foo"; name_map[e2] = "foo"; @@ -163,8 +163,8 @@ void modify_demo(MutableGraph& g) assert(out_degree(u, g) == 0); } { - tie(e1, added) = add_edge(u, v, g); - tie(e2, added) = add_edge(w, v, g); + boost::tie(e1, added) = add_edge(u, v, g); + boost::tie(e2, added) = add_edge(w, v, g); name_map[e1] = "bar"; name_map[e2] = "bar"; @@ -183,9 +183,9 @@ void modify_demo(MutableGraph& g) assert(out_degree(u, g) == 0); - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { typename GraphTraits::adjacency_iterator ai, ai_end; - for (tie(ai, ai_end) = adjacent_vertices(*vi, g); + for (boost::tie(ai, ai_end) = adjacent_vertices(*vi, g); ai != ai_end; ++ai) assert(*ai != u); } diff --git a/example/ordered_out_edges.cpp b/example/ordered_out_edges.cpp index 93613332..5c45373a 100644 --- a/example/ordered_out_edges.cpp +++ b/example/ordered_out_edges.cpp @@ -108,14 +108,14 @@ main() Traits::edge_descriptor e; Traits::out_edge_iterator e_first, e_last; - tie(e, found) = edge(0, 1, g); + boost::tie(e, found) = edge(0, 1, g); if (found) std::cout << "name(0,1) = " << name[e] << std::endl; else std::cout << "not found" << std::endl; std::cout << std::endl; - tie(e_first, e_last) = edge_range(0, 1, g); + boost::tie(e_first, e_last) = edge_range(0, 1, g); while (e_first != e_last) std::cout << "name(0,1) = " << name[*e_first++] << std::endl; #endif diff --git a/example/ospf-example.cpp b/example/ospf-example.cpp index cd7e70c7..3d0e53b7 100644 --- a/example/ospf-example.cpp +++ b/example/ospf-example.cpp @@ -43,7 +43,7 @@ main() typedef graph_traits < Graph >::vertex_descriptor vertex_descriptor; Graph g(num_vertices(g_dot)); graph_traits < g_dot_type >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g_dot); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g_dot); ei != ei_end; ++ei) { int weight = get(edge_weight, g_dot, *ei); property < edge_weight_t, int >edge_property(weight); add_edge(source(*ei, g_dot), target(*ei, g_dot), edge_property, g); @@ -51,7 +51,7 @@ main() vertex_descriptor router_six; graph_traits < g_dot_type >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g_dot); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g_dot); vi != vi_end; ++vi) if ("RT6" == get(vertex_name, g_dot, *vi)) { router_six = *vi; break; @@ -90,7 +90,7 @@ main() std::ofstream rtable("routing-table.dat"); rtable << "Dest Next Hop Total Cost" << std::endl; - for (tie(vi, vi_end) = vertices(g_dot); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g_dot); vi != vi_end; ++vi) if (parent[*vi] != *vi) { rtable << get(vertex_name, g_dot, *vi) << " "; vertex_descriptor v = *vi, child; diff --git a/example/parallel-compile-time.cpp b/example/parallel-compile-time.cpp index f66d1bd9..271cdec6 100644 --- a/example/parallel-compile-time.cpp +++ b/example/parallel-compile-time.cpp @@ -59,7 +59,7 @@ dfs_v2(const Graph & g, color[u] = ColorT::gray(); vis.discover_vertex(u, g); typename graph_traits < Graph >::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) if (color[target(*ei, g)] == ColorT::white()) { vis.tree_edge(*ei, g); dfs_v2(g, target(*ei, g), color, vis); @@ -77,9 +77,9 @@ generic_dfs_v2(const Graph & g, Visitor vis, ColorMap color) typedef typename property_traits ::value_type ColorValue; typedef color_traits < ColorValue > ColorT; typename graph_traits < Graph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) color[*vi] = ColorT::white(); - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) if (color[*vi] == ColorT::white()) dfs_v2(g, *vi, color, vis); } @@ -134,7 +134,7 @@ main() id2vertex.push_back(add_vertex(g)); while (input_begin != input_end) { size_type i, j; - tie(i, j) = *input_begin++; + boost::tie(i, j) = *input_begin++; add_edge(id2vertex[i], id2vertex[j], g); } #else @@ -158,7 +158,7 @@ main() std::ifstream name_in("makefile-target-names.dat"); std::ifstream compile_cost_in("target-compile-costs.dat"); graph_traits < file_dep_graph2 >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { name_in >> name_map[*vi]; compile_cost_in >> compile_cost_map[*vi]; } @@ -171,14 +171,14 @@ main() graph_traits < file_dep_graph2 >::adjacency_iterator vi, vi_end; // find source vertices with zero in-degree by marking all vertices with incoming edges - for (tie(i, i_end) = vertices(g); i != i_end; ++i) + for (boost::tie(i, i_end) = vertices(g); i != i_end; ++i) color_map[*i] = white_color; - for (tie(i, i_end) = vertices(g); i != i_end; ++i) - for (tie(vi, vi_end) = adjacent_vertices(*i, g); vi != vi_end; ++vi) + for (boost::tie(i, i_end) = vertices(g); i != i_end; ++i) + for (boost::tie(vi, vi_end) = adjacent_vertices(*i, g); vi != vi_end; ++vi) color_map[*vi] = black_color; // initialize distances to zero, or for source vertices, to the compile cost - for (tie(i, i_end) = vertices(g); i != i_end; ++i) + for (boost::tie(i, i_end) = vertices(g); i != i_end; ++i) if (color_map[*i] == white_color) distance_map[*i] = compile_cost_map[*i]; else @@ -189,14 +189,14 @@ main() vertex_t u = * ui; - for (tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi) if (distance_map[*vi] < distance_map[u] + compile_cost_map[*vi]) distance_map[*vi] = distance_map[u] + compile_cost_map[*vi]; } graph_property_iter_range < file_dep_graph2, vertex_distance_t >::iterator ci, ci_end; - tie(ci, ci_end) = get_property_iter_range(g, vertex_distance); + boost::tie(ci, ci_end) = get_property_iter_range(g, vertex_distance); std::cout << "total (parallel) compile time: " << *std::max_element(ci, ci_end) << std::endl; diff --git a/example/prim-example.cpp b/example/prim-example.cpp index cdd93f76..ba44aa9b 100644 --- a/example/prim-example.cpp +++ b/example/prim-example.cpp @@ -27,7 +27,7 @@ main() property_map::type weightmap = get(edge_weight, g); for (std::size_t j = 0; j < sizeof(edges) / sizeof(E); ++j) { graph_traits::edge_descriptor e; bool inserted; - tie(e, inserted) = add_edge(edges[j].first, edges[j].second, g); + boost::tie(e, inserted) = add_edge(edges[j].first, edges[j].second, g); weightmap[e] = weights[j]; } #else diff --git a/example/prim-telephone.cpp b/example/prim-telephone.cpp index 34d9dacd..6b6f914f 100644 --- a/example/prim-telephone.cpp +++ b/example/prim-telephone.cpp @@ -25,7 +25,7 @@ main() property_map < GraphvizGraph, edge_attribute_t >::type edge_attr_map = get(edge_attribute, g_dot); graph_traits < GraphvizGraph >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g_dot); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g_dot); ei != ei_end; ++ei) { int weight = lexical_cast < int >(edge_attr_map[*ei]["label"]); property < edge_weight_t, int >edge_property(weight); add_edge(source(*ei, g_dot), target(*ei, g_dot), edge_property, g); diff --git a/example/print-adjacent-vertices.cpp b/example/print-adjacent-vertices.cpp index 7b1c4b1c..6c20941d 100644 --- a/example/print-adjacent-vertices.cpp +++ b/example/print-adjacent-vertices.cpp @@ -43,7 +43,7 @@ output_adjacent_vertices(std::ostream & out, { typename graph_traits < Graph >::adjacency_iterator vi, vi_end; out << get(name_map, u) << " -> { "; - for (tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi) out << get(name_map, *vi) << " "; out << "}" << std::endl; } @@ -101,7 +101,7 @@ main() read_graph_file(file_in, name_in, g, name_map); graph_traits < graph_type >::vertex_iterator i, end; - tie(i, end) = vertices(g); + boost::tie(i, end) = vertices(g); i = std::find_if(i, end, name_equals("dax.h", get(vertex_name, g))); output_adjacent_vertices(std::cout, *i, g, get(vertex_name, g)); diff --git a/example/print-edges.cpp b/example/print-edges.cpp index 6c982675..7616022b 100644 --- a/example/print-edges.cpp +++ b/example/print-edges.cpp @@ -41,7 +41,7 @@ print_dependencies(std::ostream & out, const Graph & g, VertexNameMap name_map) { typename graph_traits < Graph >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) out << get(name_map, source(*ei, g)) << " -$>$ " << get(name_map, target(*ei, g)) << std::endl; } diff --git a/example/print-in-edges.cpp b/example/print-in-edges.cpp index d2a6f15d..f558d4e9 100644 --- a/example/print-in-edges.cpp +++ b/example/print-in-edges.cpp @@ -42,7 +42,7 @@ output_in_edges(std::ostream & out, const Graph & g, VertexNameMap name_map) { typename graph_traits < Graph >::in_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = in_edges(v, g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = in_edges(v, g); ei != ei_end; ++ei) out << get(name_map, source(*ei, g)) << " -> " << get(name_map, target(*ei, g)) << std::endl; } @@ -101,7 +101,7 @@ main() read_graph_file(file_in, name_in, g, name_map); graph_traits < graph_type >::vertex_iterator i, end; - tie(i, end) = vertices(g); + boost::tie(i, end) = vertices(g); typedef property_map < graph_type, vertex_name_t >::type name_map_t; i = std::find_if(i, end, name_equals("libzigzag.a", get(vertex_name, g))); output_in_edges(std::cout, g, *i, get(vertex_name, g)); diff --git a/example/print-out-edges.cpp b/example/print-out-edges.cpp index e5532f00..7e3cbef6 100644 --- a/example/print-out-edges.cpp +++ b/example/print-out-edges.cpp @@ -42,7 +42,7 @@ output_out_edges(std::ostream & out, const Graph & g, VertexNameMap name_map) { typename graph_traits < Graph >::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) out << get(name_map, source(*ei, g)) << " -> " << get(name_map, target(*ei, g)) << std::endl; } @@ -100,7 +100,7 @@ main() read_graph_file(file_in, name_in, g, name_map); graph_traits < graph_type >::vertex_iterator i, end; - tie(i, end) = vertices(g); + boost::tie(i, end) = vertices(g); typedef property_map < graph_type, vertex_name_t >::type name_map_t; name_equals_t < name_map_t > predicate("dax.h", get(vertex_name, g)); i = std::find_if(i, end, predicate); diff --git a/example/push-relabel-eg.cpp b/example/push-relabel-eg.cpp index 2015ebcb..407045f5 100644 --- a/example/push-relabel-eg.cpp +++ b/example/push-relabel-eg.cpp @@ -75,8 +75,8 @@ main() std::cout << "c flow values:" << std::endl; graph_traits < Graph >::vertex_iterator u_iter, u_end; graph_traits < Graph >::out_edge_iterator ei, e_end; - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) - for (tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) + for (boost::tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) if (capacity[*ei] > 0) std::cout << "f " << *u_iter << " " << target(*ei, g) << " " << (capacity[*ei] - residual_capacity[*ei]) << std::endl; diff --git a/example/quick-tour.cpp b/example/quick-tour.cpp index 2db005f6..31ffb606 100644 --- a/example/quick-tour.cpp +++ b/example/quick-tour.cpp @@ -46,7 +46,7 @@ print_trans_delays(const Graph & g, TransDelayMap trans_delay_map, VertexNameMap name_map) { typename graph_traits < Graph >::edge_iterator first, last; - for (tie(first, last) = edges(g); first != last; ++first) { + for (boost::tie(first, last) = edges(g); first != last; ++first) { print_trans_delay(*first, g, trans_delay_map, name_map); std::cout << std::endl; } @@ -71,19 +71,19 @@ build_router_network(Graph & g, VertexNameMap name_map, typename graph_traits < Graph >::edge_descriptor ed; bool inserted; - tie(ed, inserted) = add_edge(a, b, g); + boost::tie(ed, inserted) = add_edge(a, b, g); delay_map[ed] = 1.2; - tie(ed, inserted) = add_edge(a, d, g); + boost::tie(ed, inserted) = add_edge(a, d, g); delay_map[ed] = 4.5; - tie(ed, inserted) = add_edge(b, d, g); + boost::tie(ed, inserted) = add_edge(b, d, g); delay_map[ed] = 1.8; - tie(ed, inserted) = add_edge(c, a, g); + boost::tie(ed, inserted) = add_edge(c, a, g); delay_map[ed] = 2.6; - tie(ed, inserted) = add_edge(c, e, g); + boost::tie(ed, inserted) = add_edge(c, e, g); delay_map[ed] = 5.2; - tie(ed, inserted) = add_edge(d, c, g); + boost::tie(ed, inserted) = add_edge(d, c, g); delay_map[ed] = 0.4; - tie(ed, inserted) = add_edge(d, e, g); + boost::tie(ed, inserted) = add_edge(d, e, g); delay_map[ed] = 3.3; } diff --git a/example/quick_tour.cpp b/example/quick_tour.cpp index ffb08488..e639fc5a 100644 --- a/example/quick_tour.cpp +++ b/example/quick_tour.cpp @@ -31,7 +31,7 @@ template struct exercise_vertex { std::cout << "\tout-edges: "; typename graph_traits::out_edge_iterator out_i, out_end; typename graph_traits::edge_descriptor e; - for (tie(out_i, out_end) = out_edges(v, g); + for (boost::tie(out_i, out_end) = out_edges(v, g); out_i != out_end; ++out_i) { e = *out_i; @@ -44,7 +44,7 @@ template struct exercise_vertex { // Write out the incoming edges std::cout << "\tin-edges: "; typename graph_traits::in_edge_iterator in_i, in_end; - for (tie(in_i, in_end) = in_edges(v, g); in_i != in_end; ++in_i) + for (boost::tie(in_i, in_end) = in_edges(v, g); in_i != in_end; ++in_i) { e = *in_i; Vertex src = source(e, g), targ = target(e, g); @@ -56,7 +56,7 @@ template struct exercise_vertex { // Write out all adjacent vertices std::cout << "\tadjacent vertices: "; typename graph_traits::adjacency_iterator ai, ai_end; - for (tie(ai,ai_end) = adjacent_vertices(v, g); ai != ai_end; ++ai) + for (boost::tie(ai,ai_end) = adjacent_vertices(v, g); ai != ai_end; ++ai) std::cout << name[get(vertex_id, *ai)] << " "; std::cout << std::endl; } @@ -93,7 +93,7 @@ int main(int,char*[]) property_map::type weightmap = get(edge_weight, g); for (std::size_t j = 0; j < num_edges; ++j) { graph_traits::edge_descriptor e; bool inserted; - tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g); + boost::tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g); weightmap[e] = transmission_delay[j]; } #else @@ -115,7 +115,7 @@ int main(int,char*[]) std::cout << "edges(g) = "; graph_traits::edge_iterator ei, ei_end; - for (tie(ei,ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei) std::cout << "(" << name[get(vertex_id, source(*ei, g))] << "," << name[get(vertex_id, target(*ei, g))] << ") "; std::cout << std::endl; diff --git a/example/reachable-loop-head.cpp b/example/reachable-loop-head.cpp index 729335e6..2183eab1 100644 --- a/example/reachable-loop-head.cpp +++ b/example/reachable-loop-head.cpp @@ -38,7 +38,7 @@ main(int argc, char *argv[]) vattr_map = get(vertex_attribute, g); graph_traits < GraphvizDigraph >::vertex_iterator i, i_end; - for (tie(i, i_end) = vertices(g); i != i_end; ++i) + for (boost::tie(i, i_end) = vertices(g); i != i_end; ++i) if (reachable_from_head[*i] != Color::white()) { vattr_map[*i]["color"] = "gray"; vattr_map[*i]["style"] = "filled"; @@ -52,7 +52,7 @@ main(int argc, char *argv[]) << "ratio=\"fill\"\n" << "shape=\"box\"\n"; graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { loops_out << *vi << "["; for (std::map::iterator ai = vattr_map[*vi].begin(); ai != vattr_map[*vi].end(); ++ai) { @@ -65,7 +65,7 @@ main(int argc, char *argv[]) property_map::type eattr_map = get(edge_attribute, g); graph_traits::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { loops_out << source(*ei, g) << " -> " << target(*ei, g) << "["; std::map& attr_map = eattr_map[*ei]; for (std::map::iterator eai = attr_map.begin(); diff --git a/example/reachable-loop-tail.cpp b/example/reachable-loop-tail.cpp index b4ca439a..a723d143 100644 --- a/example/reachable-loop-tail.cpp +++ b/example/reachable-loop-tail.cpp @@ -50,7 +50,7 @@ main(int argc, char *argv[]) property_map::type vattr_map = get(vertex_attribute, g); graph_traits < GraphvizDigraph >::vertex_iterator i, i_end; - for (tie(i, i_end) = vertices(g_in); i != i_end; ++i) { + for (boost::tie(i, i_end) = vertices(g_in); i != i_end; ++i) { loops_out << *i << "[label=\"" << vattr_map[*i]["label"] << "\""; if (reachable_to_tail[*i] != Color::white()) { @@ -59,7 +59,7 @@ main(int argc, char *argv[]) loops_out << "]\n"; } graph_traits < GraphvizDigraph >::edge_iterator e, e_end; - for (tie(e, e_end) = edges(g_in); e != e_end; ++e) + for (boost::tie(e, e_end) = edges(g_in); e != e_end; ++e) loops_out << source(*e, g) << " -> " << target(*e, g) << ";\n"; loops_out << "}\n"; return EXIT_SUCCESS; diff --git a/example/read_write_dimacs-eg.cpp b/example/read_write_dimacs-eg.cpp index f5c19809..64ac43b7 100644 --- a/example/read_write_dimacs-eg.cpp +++ b/example/read_write_dimacs-eg.cpp @@ -90,12 +90,12 @@ int main() //we take the source node and check for each outgoing edge e which has a target(p) if we can augment that path out_edge_iterator oei,oe_end; - for(tie(oei, oe_end) = out_edges(s, g); oei != oe_end; ++oei){ + for(boost::tie(oei, oe_end) = out_edges(s, g); oei != oe_end; ++oei){ edge_descriptor from_source = *oei; vertex_descriptor v = target(from_source, g); edge_descriptor to_sink; bool is_there; - tie(to_sink, is_there) = edge(v, t, g); + boost::tie(to_sink, is_there) = edge(v, t, g); if( is_there ){ if( get(capacity, to_sink) > get(capacity, from_source) ){ tCapMapValue to_augment = get(capacity, from_source); diff --git a/example/remove_edge_if_bidir.cpp b/example/remove_edge_if_bidir.cpp index 09ddea09..9b7ef69f 100644 --- a/example/remove_edge_if_bidir.cpp +++ b/example/remove_edge_if_bidir.cpp @@ -79,7 +79,7 @@ main() int w = 0; graph_traits::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) weight[*ei] = ++w; property_map::type indexmap = get(vertex_index, g); diff --git a/example/remove_edge_if_undir.cpp b/example/remove_edge_if_undir.cpp index 7af8131b..3fc5b571 100644 --- a/example/remove_edge_if_undir.cpp +++ b/example/remove_edge_if_undir.cpp @@ -78,7 +78,7 @@ main() int w = 0; graph_traits::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) weight[*ei] = ++w; std::cout << "original graph:" << std::endl; diff --git a/example/roget_components.cpp b/example/roget_components.cpp index c5d2efa0..8a34f22e 100644 --- a/example/roget_components.cpp +++ b/example/roget_components.cpp @@ -72,12 +72,12 @@ int main(int argc, char* argv[]) // First add representative vertices to each component's list graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) if (root[*vi] == *vi) strong_comp[comp[index_map[*vi]]].push_back(*vi); // Then add the other vertices of the component - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) if (root[*vi] != *vi) strong_comp[comp[index_map[*vi]]].push_back(*vi); @@ -117,7 +117,7 @@ int main(int argc, char* argv[]) for (i = 0; i < strong_comp[c].size(); ++i) { vertex_t v = strong_comp[c][i]; graph_traits::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(v, g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(v, g); ei != ei_end; ++ei) { vertex_t x = target(*ei, g); int comp_x = comp[index_map[x]]; if (comp_x != c && mark[comp_x] != c) { diff --git a/example/scc.cpp b/example/scc.cpp index 0851d321..e34fe582 100644 --- a/example/scc.cpp +++ b/example/scc.cpp @@ -29,7 +29,7 @@ main() std::string color[] = { "white", "gray", "black", "lightgray"}; graph_traits < GraphvizDigraph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { vertex_attr_map[*vi]["color"] = color[component[*vi]]; vertex_attr_map[*vi]["style"] = "filled"; if (vertex_attr_map[*vi]["color"] == "black") diff --git a/example/subgraph.cpp b/example/subgraph.cpp index 25db1960..a28a6cab 100644 --- a/example/subgraph.cpp +++ b/example/subgraph.cpp @@ -77,7 +77,7 @@ int main(int,char*[]) Graph::children_iterator ci, ci_end; int num = 1; - for (tie(ci, ci_end) = G0.children(); ci != ci_end; ++ci) { + for (boost::tie(ci, ci_end) = G0.children(); ci != ci_end; ++ci) { std::cout << "G" << num++ << ":" << std::endl; print_graph(*ci, get(vertex_index, *ci)); print_edges2(*ci, get(vertex_index, *ci), get(edge_index, *ci)); diff --git a/example/tiernan_girth_circumference.cpp b/example/tiernan_girth_circumference.cpp index 06a996ab..a277a3fd 100644 --- a/example/tiernan_girth_circumference.cpp +++ b/example/tiernan_girth_circumference.cpp @@ -29,7 +29,7 @@ main(int argc, char *argv[]) // Compute the girth and circumference simulataneously size_t girth, circ; - tie(girth, circ) = tiernan_girth_and_circumference(g); + boost::tie(girth, circ) = tiernan_girth_and_circumference(g); // Print the result cout << "girth: " << girth << endl; diff --git a/example/topo-sort-file-dep.cpp b/example/topo-sort-file-dep.cpp index 21d0d326..98cca5f0 100644 --- a/example/topo-sort-file-dep.cpp +++ b/example/topo-sort-file-dep.cpp @@ -38,7 +38,7 @@ topo_sort_dfs(const file_dep_graph & g, vertex_t u, vertex_t * &topo_order, { mark[u] = 1; // 1 means visited, 0 means not yet visited graph_traits < file_dep_graph >::adjacency_iterator vi, vi_end; - for (tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi) if (mark[*vi] == 0) topo_sort_dfs(g, *vi, topo_order, mark); @@ -50,7 +50,7 @@ topo_sort(const file_dep_graph & g, vertex_t * topo_order) { std::vector < int >mark(num_vertices(g), 0); graph_traits < file_dep_graph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) if (mark[*vi] == 0) topo_sort_dfs(g, *vi, topo_order, &mark[0]); } @@ -70,7 +70,7 @@ main() file_dep_graph g(n_vertices); while (input_begin != input_end) { size_type i, j; - tie(i, j) = *input_begin++; + boost::tie(i, j) = *input_begin++; add_edge(i, j, g); } #else @@ -80,7 +80,7 @@ main() std::vector < std::string > name(num_vertices(g)); std::ifstream name_in("makefile-target-names.dat"); graph_traits < file_dep_graph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) name_in >> name[*vi]; std::vector < vertex_t > order(num_vertices(g)); diff --git a/example/topo-sort-file-dep2.cpp b/example/topo-sort-file-dep2.cpp index 05024761..5d9f2098 100644 --- a/example/topo-sort-file-dep2.cpp +++ b/example/topo-sort-file-dep2.cpp @@ -42,7 +42,7 @@ dfs_v1(const file_dep_graph & g, vertex_t u, default_color_type * color, color[u] = gray_color; vis.discover_vertex(u, g); graph_traits < file_dep_graph >::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { if (color[target(*ei, g)] == white_color) { vis.tree_edge(*ei, g); dfs_v1(g, target(*ei, g), color, vis); @@ -60,7 +60,7 @@ generic_dfs_v1(const file_dep_graph & g, Visitor vis) { std::vector < default_color_type > color(num_vertices(g), white_color); graph_traits < file_dep_graph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { if (color[*vi] == white_color) dfs_v1(g, *vi, &color[0], vis); } @@ -130,7 +130,7 @@ main() file_dep_graph g(n_vertices); while (input_begin != input_end) { size_type i, j; - tie(i, j) = *input_begin++; + boost::tie(i, j) = *input_begin++; add_edge(i, j, g); } #else @@ -140,7 +140,7 @@ main() std::vector < std::string > name(num_vertices(g)); std::ifstream name_in("makefile-target-names.dat"); graph_traits < file_dep_graph >::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) name_in >> name[*vi]; std::vector < vertex_t > order(num_vertices(g)); diff --git a/example/transpose-example.cpp b/example/transpose-example.cpp index 0231027f..252901bb 100644 --- a/example/transpose-example.cpp +++ b/example/transpose-example.cpp @@ -25,7 +25,7 @@ main() name_map = get(vertex_name, G); char name = 'a'; graph_traits < graph_t >::vertex_iterator v, v_end; - for (tie(v, v_end) = vertices(G); v != v_end; ++v, ++name) + for (boost::tie(v, v_end) = vertices(G); v != v_end; ++v, ++name) name_map[*v] = name; typedef std::pair < int, int >E; @@ -44,7 +44,7 @@ main() print_graph(G_T, name_map); graph_traits < graph_t >::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(G); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(G); ei != ei_end; ++ei) assert(edge(target(*ei, G), source(*ei, G), G_T).second == true); return 0; } diff --git a/example/undirected.cpp b/example/undirected.cpp index 49a7ed7d..97b14d99 100644 --- a/example/undirected.cpp +++ b/example/undirected.cpp @@ -27,10 +27,10 @@ undirected_graph_demo1() add_edge(one, two, undigraph); std::cout << "out_edges(0): "; - for (tie(out, out_end) = out_edges(zero, undigraph); out != out_end; ++out) + for (boost::tie(out, out_end) = out_edges(zero, undigraph); out != out_end; ++out) std::cout << *out; std::cout << std::endl << "in_edges(0): "; - for (tie(in, in_end) = in_edges(zero, undigraph); in != in_end; ++in) + for (boost::tie(in, in_end) = in_edges(zero, undigraph); in != in_end; ++in) std::cout << *in; std::cout << std::endl; } @@ -51,8 +51,8 @@ directed_graph_demo() v = vertex(1, digraph); add_edge(u, v, Weight(1.2), digraph); add_edge(v, u, Weight(2.4), digraph); - tie(e1, found) = edge(u, v, digraph); - tie(e2, found) = edge(v, u, digraph); + boost::tie(e1, found) = edge(u, v, digraph); + boost::tie(e2, found) = edge(v, u, digraph); std::cout << "in a directed graph is "; #ifdef __GNUC__ // no boolalpha @@ -80,8 +80,8 @@ undirected_graph_demo2() u = vertex(0, undigraph); v = vertex(1, undigraph); add_edge(u, v, Weight(3.1), undigraph); - tie(e1, found) = edge(u, v, undigraph); - tie(e2, found) = edge(v, u, undigraph); + boost::tie(e1, found) = edge(u, v, undigraph); + boost::tie(e2, found) = edge(v, u, undigraph); std::cout << "in an undirected graph is "; #ifdef __GNUC__ std::cout << "(u,v) == (v,u) ? " << (e1 == e2) << std::endl; diff --git a/include/boost/graph/adj_list_serialize.hpp b/include/boost/graph/adj_list_serialize.hpp index af0c0d89..c1ff4111 100644 --- a/include/boost/graph/adj_list_serialize.hpp +++ b/include/boost/graph/adj_list_serialize.hpp @@ -92,7 +92,7 @@ inline void load( ar >> BOOST_SERIALIZATION_NVP(u); ar >> BOOST_SERIALIZATION_NVP(v); Edge e; bool inserted; - tie(e,inserted) = add_edge(verts[u], verts[v], graph); + boost::tie(e,inserted) = add_edge(verts[u], verts[v], graph); ar >> serialization::make_nvp("edge_property", get(edge_all_t(), graph, e) ); } } diff --git a/include/boost/graph/adjacency_matrix.hpp b/include/boost/graph/adjacency_matrix.hpp index a3694dab..e841333b 100644 --- a/include/boost/graph/adjacency_matrix.hpp +++ b/include/boost/graph/adjacency_matrix.hpp @@ -766,7 +766,7 @@ namespace boost { { typename adjacency_matrix::degree_size_type n = 0; typename adjacency_matrix::out_edge_iterator f, l; - for (tie(f, l) = out_edges(u, g); f != l; ++f) + for (boost::tie(f, l) = out_edges(u, g); f != l; ++f) ++n; return n; } @@ -848,7 +848,7 @@ namespace boost { { typename adjacency_matrix::degree_size_type n = 0; typename adjacency_matrix::in_edge_iterator f, l; - for (tie(f, l) = in_edges(u, g); f != l; ++f) + for (boost::tie(f, l) = in_edges(u, g); f != l; ++f) ++n; return n; } @@ -1017,9 +1017,9 @@ namespace boost { { typename adjacency_matrix::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) remove_edge(u, *vi, g); - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) remove_edge(*vi, u, g); } @@ -1032,7 +1032,7 @@ namespace boost { { typename adjacency_matrix::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) remove_edge(u, *vi, g); } diff --git a/include/boost/graph/astar_search.hpp b/include/boost/graph/astar_search.hpp index 47474337..404bc8cc 100644 --- a/include/boost/graph/astar_search.hpp +++ b/include/boost/graph/astar_search.hpp @@ -284,7 +284,7 @@ namespace boost { typedef typename property_traits::value_type ColorValue; typedef color_traits Color; typename graph_traits::vertex_iterator ui, ui_end; - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { put(color, *ui, Color::white()); put(distance, *ui, inf); put(cost, *ui, inf); diff --git a/include/boost/graph/bandwidth.hpp b/include/boost/graph/bandwidth.hpp index ea44b317..0bfeefb9 100644 --- a/include/boost/graph/bandwidth.hpp +++ b/include/boost/graph/bandwidth.hpp @@ -24,7 +24,7 @@ namespace boost { typedef typename graph_traits::vertices_size_type size_type; size_type b = 0; typename graph_traits::out_edge_iterator e, end; - for (tie(e, end) = out_edges(i, g); e != end; ++e) { + for (boost::tie(e, end) = out_edges(i, g); e != end; ++e) { int f_i = get(index, i); int f_j = get(index, target(*e, g)); using namespace std; // to call abs() unqualified @@ -49,7 +49,7 @@ namespace boost { BOOST_USING_STD_MAX(); typename graph_traits::vertices_size_type b = 0; typename graph_traits::vertex_iterator i, end; - for (tie(i, end) = vertices(g); i != end; ++i) + for (boost::tie(i, end) = vertices(g); i != end; ++i) b = max BOOST_PREVENT_MACRO_SUBSTITUTION (b, ith_bandwidth(*i, g, index)); return b; } @@ -69,7 +69,7 @@ namespace boost { typedef typename detail::numeric_traits::difference_type diff_t; size_type sum = 0; typename graph_traits::edge_iterator i, end; - for (tie(i, end) = edges(g); i != end; ++i) { + for (boost::tie(i, end) = edges(g); i != end; ++i) { diff_t f_u = get(index_map, source(*i, g)); diff_t f_v = get(index_map, target(*i, g)); using namespace std; // to call abs() unqualified diff --git a/include/boost/graph/bellman_ford_shortest_paths.hpp b/include/boost/graph/bellman_ford_shortest_paths.hpp index 4001c288..8fc02529 100644 --- a/include/boost/graph/bellman_ford_shortest_paths.hpp +++ b/include/boost/graph/bellman_ford_shortest_paths.hpp @@ -108,7 +108,7 @@ namespace boost { for (Size k = 0; k < N; ++k) { bool at_least_one_edge_relaxed = false; - for (tie(i, end) = edges(g); i != end; ++i) { + for (boost::tie(i, end) = edges(g); i != end; ++i) { v.examine_edge(*i, g); if (relax(*i, g, weight, pred, distance, combine, compare)) { at_least_one_edge_relaxed = true; @@ -120,7 +120,7 @@ namespace boost { break; } - for (tie(i, end) = edges(g); i != end; ++i) + for (boost::tie(i, end) = edges(g); i != end; ++i) if (compare(combine(get(distance, source(*i, g)), get(weight, *i)), get(distance, target(*i,g)))) { @@ -148,7 +148,7 @@ namespace boost { bellman_visitor<> null_vis; typedef typename property_traits::value_type weight_type; typename graph_traits::vertex_iterator v, v_end; - for (tie(v, v_end) = vertices(g); v != v_end; ++v) { + for (boost::tie(v, v_end) = vertices(g); v != v_end; ++v) { put(distance, *v, (std::numeric_limits::max)()); put(pred, *v, *v); } diff --git a/include/boost/graph/betweenness_centrality.hpp b/include/boost/graph/betweenness_centrality.hpp index 06b7be06..052f0633 100644 --- a/include/boost/graph/betweenness_centrality.hpp +++ b/include/boost/graph/betweenness_centrality.hpp @@ -305,10 +305,10 @@ namespace detail { namespace graph { std::stack ordered_vertices; vertex_iterator s, s_end; - for (tie(s, s_end) = vertices(g); s != s_end; ++s) { + for (boost::tie(s, s_end) = vertices(g); s != s_end; ++s) { // Initialize for this iteration vertex_iterator w, w_end; - for (tie(w, w_end) = vertices(g); w != w_end; ++w) { + for (boost::tie(w, w_end) = vertices(g); w != w_end; ++w) { incoming[*w].clear(); put(path_count, *w, 0); put(dependency, *w, 0); @@ -581,7 +581,7 @@ relative_betweenness_centrality(const Graph& g, CentralityMap centrality) typename graph_traits::vertices_size_type n = num_vertices(g); centrality_type factor = centrality_type(2)/centrality_type(n*n - 3*n + 2); vertex_iterator v, v_end; - for (tie(v, v_end) = vertices(g); v != v_end; ++v) { + for (boost::tie(v, v_end) = vertices(g); v != v_end; ++v) { put(centrality, *v, factor * get(centrality, *v)); } } @@ -602,13 +602,13 @@ central_point_dominance(const Graph& g, CentralityMap centrality // Find max centrality centrality_type max_centrality(0); vertex_iterator v, v_end; - for (tie(v, v_end) = vertices(g); v != v_end; ++v) { + for (boost::tie(v, v_end) = vertices(g); v != v_end; ++v) { max_centrality = (max)(max_centrality, get(centrality, *v)); } // Compute central point dominance centrality_type sum(0); - for (tie(v, v_end) = vertices(g); v != v_end; ++v) { + for (boost::tie(v, v_end) = vertices(g); v != v_end; ++v) { sum += (max_centrality - get(centrality, *v)); } return sum/(n-1); diff --git a/include/boost/graph/bipartite.hpp b/include/boost/graph/bipartite.hpp index 90cff6fe..f902fd3e 100644 --- a/include/boost/graph/bipartite.hpp +++ b/include/boost/graph/bipartite.hpp @@ -291,7 +291,7 @@ namespace boost { predecessor_recorder_t predecessor_recorder (predecessor_map); /// Initialize predecessor map - for (tie (vertex_iter, vertex_end) = vertices (graph); vertex_iter != vertex_end; ++vertex_iter) + for (boost::tie (vertex_iter, vertex_end) = vertices (graph); vertex_iter != vertex_end; ++vertex_iter) { put (predecessor_map, *vertex_iter, *vertex_iter); } diff --git a/include/boost/graph/boykov_kolmogorov_max_flow.hpp b/include/boost/graph/boykov_kolmogorov_max_flow.hpp index 6eebf7fe..8559bd77 100644 --- a/include/boost/graph/boykov_kolmogorov_max_flow.hpp +++ b/include/boost/graph/boykov_kolmogorov_max_flow.hpp @@ -118,13 +118,13 @@ class bk_max_flow { m_last_grow_vertex(graph_traits::null_vertex()){ // initialize the color-map with gray-values vertex_iterator vi, v_end; - for(tie(vi, v_end) = vertices(m_g); vi != v_end; ++vi){ + for(boost::tie(vi, v_end) = vertices(m_g); vi != v_end; ++vi){ set_tree(*vi, tColorTraits::gray()); } // Initialize flow to zero which means initializing // the residual capacity equal to the capacity edge_iterator ei, e_end; - for(tie(ei, e_end) = edges(m_g); ei != e_end; ++ei) { + for(boost::tie(ei, e_end) = edges(m_g); ei != e_end; ++ei) { m_res_cap_map[*ei] = m_cap_map[*ei]; assert(m_rev_edge_map[m_rev_edge_map[*ei]] == *ei); //check if the reverse edge map is build up properly } @@ -142,7 +142,7 @@ class bk_max_flow { while(true){ bool path_found; edge_descriptor connecting_edge; - tie(connecting_edge, path_found) = grow(); //find a path from source to sink + boost::tie(connecting_edge, path_found) = grow(); //find a path from source to sink if(!path_found){ //we're finished, no more paths were found break; @@ -164,7 +164,7 @@ class bk_max_flow { // connects but shouldn't have an impact on other maxflow problems // (this is done in grow() anyway) out_edge_iterator ei, e_end; - for(tie(ei, e_end) = out_edges(m_source, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(m_source, m_g); ei != e_end; ++ei){ edge_descriptor from_source = *ei; vertex_descriptor current_node = target(from_source, m_g); if(current_node == m_sink){ @@ -175,7 +175,7 @@ class bk_max_flow { } edge_descriptor to_sink; bool is_there; - tie(to_sink, is_there) = lookup_edge(current_node, m_sink, m_g); + boost::tie(to_sink, is_there) = lookup_edge(current_node, m_sink, m_g); if(is_there){ tEdgeVal cap_from_source = m_res_cap_map[from_source]; tEdgeVal cap_to_sink = m_res_cap_map[to_sink]; @@ -215,7 +215,7 @@ class bk_max_flow { add_active_node(current_node); } } - for(tie(ei, e_end) = out_edges(m_sink, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(m_sink, m_g); ei != e_end; ++ei){ edge_descriptor to_sink = m_rev_edge_map[*ei]; vertex_descriptor current_node = source(to_sink, m_g); if(m_res_cap_map[to_sink]){ @@ -248,7 +248,7 @@ class bk_max_flow { out_edge_iterator ei, e_end; if(current_node != m_last_grow_vertex){ m_last_grow_vertex = current_node; - tie(m_last_grow_edge_it, m_last_grow_edge_end) = out_edges(current_node, m_g); + boost::tie(m_last_grow_edge_it, m_last_grow_edge_end) = out_edges(current_node, m_g); } for(; m_last_grow_edge_it != m_last_grow_edge_end; ++m_last_grow_edge_it) { edge_descriptor out_edge = *m_last_grow_edge_it; @@ -282,7 +282,7 @@ class bk_max_flow { out_edge_iterator ei, e_end; if(current_node != m_last_grow_vertex){ m_last_grow_vertex = current_node; - tie(m_last_grow_edge_it, m_last_grow_edge_end) = out_edges(current_node, m_g); + boost::tie(m_last_grow_edge_it, m_last_grow_edge_end) = out_edges(current_node, m_g); } for(; m_last_grow_edge_it != m_last_grow_edge_end; ++m_last_grow_edge_it){ edge_descriptor in_edge = m_rev_edge_map[*m_last_grow_edge_it]; @@ -419,7 +419,7 @@ class bk_max_flow { tDistanceVal min_distance = (std::numeric_limits::max)(); edge_descriptor new_parent_edge; out_edge_iterator ei, e_end; - for(tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ const edge_descriptor in_edge = m_rev_edge_map[*ei]; assert(target(in_edge, m_g) == current_node); //we should be the target of this edge if(m_res_cap_map[in_edge] > 0){ @@ -438,7 +438,7 @@ class bk_max_flow { m_time_map[current_node] = m_time; } else{ m_time_map[current_node] = 0; - for(tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ edge_descriptor in_edge = m_rev_edge_map[*ei]; vertex_descriptor other_node = source(in_edge, m_g); if(get_tree(other_node) == tColorTraits::black() && has_parent(other_node)){ @@ -462,7 +462,7 @@ class bk_max_flow { out_edge_iterator ei, e_end; edge_descriptor new_parent_edge; tDistanceVal min_distance = (std::numeric_limits::max)(); - for(tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ const edge_descriptor out_edge = *ei; if(m_res_cap_map[out_edge] > 0){ const vertex_descriptor other_node = target(out_edge, m_g); @@ -479,7 +479,7 @@ class bk_max_flow { m_time_map[current_node] = m_time; } else{ m_time_map[current_node] = 0; - for(tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ const edge_descriptor out_edge = *ei; const vertex_descriptor other_node = target(out_edge, m_g); if(get_tree(other_node) == tColorTraits::white() && has_parent(other_node)){ diff --git a/include/boost/graph/bron_kerbosch_all_cliques.hpp b/include/boost/graph/bron_kerbosch_all_cliques.hpp index f6d253b1..35479316 100644 --- a/include/boost/graph/bron_kerbosch_all_cliques.hpp +++ b/include/boost/graph/bron_kerbosch_all_cliques.hpp @@ -280,7 +280,7 @@ bron_kerbosch_all_cliques(const Graph& g, Visitor vis, std::size_t min) // constant inserts and removals at the end and also a constant size. VertexIterator i, end; - tie(i, end) = vertices(g); + boost::tie(i, end) = vertices(g); VertexSet cands(i, end); // start with all vertices as candidates VertexSet nots; // start with no vertices visited diff --git a/include/boost/graph/clustering_coefficient.hpp b/include/boost/graph/clustering_coefficient.hpp index e5f94d9f..15574f04 100644 --- a/include/boost/graph/clustering_coefficient.hpp +++ b/include/boost/graph/clustering_coefficient.hpp @@ -72,7 +72,7 @@ num_paths_through_vertex(const Graph& g, Vertex v) // for things like this (num_neighbors() would be great). AdjacencyIterator i, end; - tie(i, end) = adjacent_vertices(v, g); + boost::tie(i, end) = adjacent_vertices(v, g); std::size_t k = std::distance(i, end); return detail::possible_edges(g, k, Directed()); } @@ -92,7 +92,7 @@ num_triangles_on_vertex(const Graph& g, Vertex v) Degree count(0); AdjacencyIterator i, j, end; - for(tie(i, end) = adjacent_vertices(v, g); i != end; ++i) { + for(boost::tie(i, end) = adjacent_vertices(v, g); i != end; ++i) { for(j = boost::next(i); j != end; ++j) { count += detail::count_edges(g, *i, *j, Directed()); } @@ -127,7 +127,7 @@ all_clustering_coefficients(const Graph& g, ClusteringMap cm) Coefficient sum(0); VertexIterator i, end; - for(tie(i, end) = vertices(g); i != end; ++i) { + for(boost::tie(i, end) = vertices(g); i != end; ++i) { Coefficient cc = clustering_coefficient(g, *i); put(cm, *i, cc); sum += cc; @@ -147,7 +147,7 @@ mean_clustering_coefficient(const Graph& g, ClusteringMap cm) Coefficient cc(0); VertexIterator i, end; - for(tie(i, end) = vertices(g); i != end; ++i) { + for(boost::tie(i, end) = vertices(g); i != end; ++i) { cc += get(cm, *i); } return cc / Coefficient(num_vertices(g)); diff --git a/include/boost/graph/copy.hpp b/include/boost/graph/copy.hpp index c566503a..402e75f2 100644 --- a/include/boost/graph/copy.hpp +++ b/include/boost/graph/copy.hpp @@ -113,19 +113,19 @@ namespace boost { Orig2CopyVertexIndexMap orig2copy, IndexMap) { typename graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g_in); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g_in); vi != vi_end; ++vi) { typename graph_traits::vertex_descriptor new_v = add_vertex(g_out); put(orig2copy, *vi, new_v); copy_vertex(*vi, new_v); } typename graph_traits::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g_in); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g_in); ei != ei_end; ++ei) { typename graph_traits::edge_descriptor new_e; bool inserted; - tie(new_e, inserted) = add_edge(get(orig2copy, source(*ei, g_in)), - get(orig2copy, target(*ei, g_in)), - g_out); + boost::tie(new_e, inserted) = add_edge(get(orig2copy, source(*ei, g_in)), + get(orig2copy, target(*ei, g_in)), + g_out); copy_edge(*ei, new_e); } } @@ -142,20 +142,20 @@ namespace boost { Orig2CopyVertexIndexMap orig2copy, IndexMap) { typename graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g_in); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g_in); vi != vi_end; ++vi) { typename graph_traits::vertex_descriptor new_v = add_vertex(g_out); put(orig2copy, *vi, new_v); copy_vertex(*vi, new_v); } - for (tie(vi, vi_end) = vertices(g_in); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g_in); vi != vi_end; ++vi) { typename graph_traits::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(*vi, g_in); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(*vi, g_in); ei != ei_end; ++ei) { typename graph_traits::edge_descriptor new_e; bool inserted; - tie(new_e, inserted) = add_edge(get(orig2copy, source(*ei, g_in)), - get(orig2copy, target(*ei, g_in)), - g_out); + boost::tie(new_e, inserted) = add_edge(get(orig2copy, source(*ei, g_in)), + get(orig2copy, target(*ei, g_in)), + g_out); copy_edge(*ei, new_e); } } @@ -177,21 +177,21 @@ namespace boost { std::vector color(num_vertices(g_in), Color::white()); typename graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g_in); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g_in); vi != vi_end; ++vi) { typename graph_traits::vertex_descriptor new_v = add_vertex(g_out); put(orig2copy, *vi, new_v); copy_vertex(*vi, new_v); } - for (tie(vi, vi_end) = vertices(g_in); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g_in); vi != vi_end; ++vi) { typename graph_traits::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(*vi, g_in); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(*vi, g_in); ei != ei_end; ++ei) { typename graph_traits::edge_descriptor new_e; bool inserted; if (color[get(index_map, target(*ei, g_in))] == Color::white()) { - tie(new_e, inserted) = add_edge(get(orig2copy, source(*ei,g_in)), - get(orig2copy, target(*ei,g_in)), - g_out); + boost::tie(new_e, inserted) = add_edge(get(orig2copy, source(*ei,g_in)), + get(orig2copy, target(*ei,g_in)), + g_out); copy_edge(*ei, new_e); } } @@ -361,9 +361,9 @@ namespace boost { void examine_edge(Edge e, const Graph& g_in) const { typename graph_traits::edge_descriptor new_e; bool inserted; - tie(new_e, inserted) = add_edge(get(orig2copy, source(e, g_in)), - get(orig2copy, target(e, g_in)), - g_out); + boost::tie(new_e, inserted) = add_edge(get(orig2copy, source(e, g_in)), + get(orig2copy, target(e, g_in)), + g_out); copy_edge(e, new_e); } private: diff --git a/include/boost/graph/core_numbers.hpp b/include/boost/graph/core_numbers.hpp index da072bf1..7ef08261 100644 --- a/include/boost/graph/core_numbers.hpp +++ b/include/boost/graph/core_numbers.hpp @@ -122,11 +122,11 @@ namespace boost { { typename graph_traits::vertex_iterator vi,vi_end; typename graph_traits::out_edge_iterator ei,ei_end; - for (tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { + for (boost::tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { put(d,*vi,0); } - for (tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { - for (tie(ei,ei_end) = out_edges(*vi,g); ei!=ei_end; ++ei) { + for (boost::tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { + for (boost::tie(ei,ei_end) = out_edges(*vi,g); ei!=ei_end; ++ei) { put(d,target(*ei,g),get(d,target(*ei,g))+get(wm,*ei)); } } @@ -151,7 +151,7 @@ namespace boost { Q.pop(); v_cn = get(c,v); typename graph_traits::out_edge_iterator oi,oi_end; - for (tie(oi,oi_end) = out_edges(v,g); oi!=oi_end; ++oi) { + for (boost::tie(oi,oi_end) = out_edges(v,g); oi!=oi_end; ++oi) { vis.examine_edge(*oi,g); vertex u = target(*oi,g); // if c[u] > c[v], then u is still in the graph, @@ -182,7 +182,7 @@ namespace boost { IndexMap> MutableQueue; MutableQueue Q(num_vertices(g), icmp, im); typename graph_traits::vertex_iterator vi,vi_end; - for (tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { + for (boost::tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { Q.push(*vi); } return core_numbers_impl(g, c, wm, Q, vis); @@ -206,14 +206,14 @@ namespace boost { // compute the maximum degree (degrees are in the coremap) typename graph_traits::degree_size_type max_deg = 0; - for (tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { + for (boost::tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { max_deg = (std::max::degree_size_type>)(max_deg, get(c,*vi)); } // store the vertices in bins by their degree // allocate two extra locations to ease boundary cases std::vector bin(max_deg+2); - for (tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { + for (boost::tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { ++bin[get(c,*vi)]; } @@ -229,7 +229,7 @@ namespace boost { // perform the bucket sort with pos and vert so that // pos[0] is the vertex of smallest degree std::vector vert(num_vertices(g)); - for (tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { + for (boost::tie(vi,vi_end) = vertices(g); vi!=vi_end; ++vi) { vertex v=*vi; size_type p=bin[get(c,v)]; put(pos,v,p); @@ -247,7 +247,7 @@ namespace boost { vis.examine_vertex(v,g); v_cn = get(c,v); typename graph_traits::out_edge_iterator oi,oi_end; - for (tie(oi,oi_end) = out_edges(v,g); oi!=oi_end; ++oi) { + for (boost::tie(oi,oi_end) = out_edges(v,g); oi!=oi_end; ++oi) { vis.examine_edge(*oi,g); vertex u = target(*oi,g); // if c[u] > c[v], then u is still in the graph, diff --git a/include/boost/graph/create_condensation_graph.hpp b/include/boost/graph/create_condensation_graph.hpp index 4f3316f6..f874a086 100644 --- a/include/boost/graph/create_condensation_graph.hpp +++ b/include/boost/graph/create_condensation_graph.hpp @@ -38,7 +38,7 @@ namespace boost { for (size_type i = 0; i < components[si].size(); ++i) { vertex u = components[s][i]; typename graph_traits::adjacency_iterator v, v_end; - for (tie(v, v_end) = adjacent_vertices(u, g); v != v_end; ++v) { + for (boost::tie(v, v_end) = adjacent_vertices(u, g); v != v_end; ++v) { cg_vertex t = to_cg_vertex[component_number[*v]]; if (s != t) // Avoid loops in the condensation graph adj.push_back(t); @@ -50,7 +50,7 @@ namespace boost { cg_vertex t = adj[i]; typename graph_traits::edge_descriptor e; bool inserted; - tie(e, inserted) = add_edge(s, t, cg); + boost::tie(e, inserted) = add_edge(s, t, cg); put(edge_mult_map, e, 1); ++i; while (i < adj.size()) { @@ -58,7 +58,7 @@ namespace boost { put(edge_mult_map, e, get(edge_mult_map, e) + 1); else { t = adj[i]; - tie(e, inserted) = add_edge(s, t, cg); + boost::tie(e, inserted) = add_edge(s, t, cg); put(edge_mult_map, e, 1); } ++i; diff --git a/include/boost/graph/cuthill_mckee_ordering.hpp b/include/boost/graph/cuthill_mckee_ordering.hpp index c930bab3..52dc982a 100644 --- a/include/boost/graph/cuthill_mckee_ordering.hpp +++ b/include/boost/graph/cuthill_mckee_ordering.hpp @@ -92,7 +92,7 @@ namespace boost { // Copy degree to pseudo_degree // initialize the color map - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui){ + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui){ put(color, *ui, Color::white()); } diff --git a/include/boost/graph/dag_shortest_paths.hpp b/include/boost/graph/dag_shortest_paths.hpp index d8b47ac6..a46de914 100644 --- a/include/boost/graph/dag_shortest_paths.hpp +++ b/include/boost/graph/dag_shortest_paths.hpp @@ -46,7 +46,7 @@ namespace boost { depth_first_visit(g, s, topo_visitor, color); typename graph_traits::vertex_iterator ui, ui_end; - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { put(distance, *ui, inf); put(pred, *ui, *ui); } @@ -58,7 +58,7 @@ namespace boost { Vertex u = *i; vis.examine_vertex(u, g); typename graph_traits::out_edge_iterator e, e_end; - for (tie(e, e_end) = out_edges(u, g); e != e_end; ++e) { + for (boost::tie(e, e_end) = out_edges(u, g); e != e_end; ++e) { vis.discover_vertex(target(*e, g), g); bool decreased = relax(*e, g, weight, pred, distance, combine, compare); diff --git a/include/boost/graph/depth_first_search.hpp b/include/boost/graph/depth_first_search.hpp index fcc61646..fde69f0f 100644 --- a/include/boost/graph/depth_first_search.hpp +++ b/include/boost/graph/depth_first_search.hpp @@ -100,7 +100,7 @@ namespace boost { put(color, u, Color::gray()); vis.discover_vertex(u, g); - tie(ei, ei_end) = out_edges(u, g); + boost::tie(ei, ei_end) = out_edges(u, g); // Variable is needed to workaround a borland bug. TF& fn = static_cast(func); if (fn(u, g)) { @@ -112,7 +112,7 @@ namespace boost { while (!stack.empty()) { VertexInfo& back = stack.back(); u = back.first; - tie(ei, ei_end) = back.second; + boost::tie(ei, ei_end) = back.second; stack.pop_back(); while (ei != ei_end) { Vertex v = target(*ei, g); @@ -124,7 +124,7 @@ namespace boost { u = v; put(color, u, Color::gray()); vis.discover_vertex(u, g); - tie(ei, ei_end) = out_edges(u, g); + boost::tie(ei, ei_end) = out_edges(u, g); if (fn(u, g)) { ei = ei_end; } @@ -166,7 +166,7 @@ namespace boost { // Variable is needed to workaround a borland bug. TF& fn = static_cast(func); if (!fn(u, g)) - for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { Vertex v = target(*ei, g); vis.examine_edge(*ei, g); ColorValue v_color = get(color, v); if (v_color == Color::white()) { vis.tree_edge(*ei, g); @@ -192,7 +192,7 @@ namespace boost { typedef color_traits Color; typename graph_traits::vertex_iterator ui, ui_end; - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { Vertex u = implicit_cast(*ui); put(color, u, Color::white()); vis.initialize_vertex(u, g); } @@ -202,7 +202,7 @@ namespace boost { detail::nontruth2()); } - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { Vertex u = implicit_cast(*ui); ColorValue u_color = get(color, u); if (u_color == Color::white()) { vis.start_vertex(u, g); diff --git a/include/boost/graph/detail/compressed_sparse_row_struct.hpp b/include/boost/graph/detail/compressed_sparse_row_struct.hpp index ad26c797..4fb3c226 100644 --- a/include/boost/graph/detail/compressed_sparse_row_struct.hpp +++ b/include/boost/graph/detail/compressed_sparse_row_struct.hpp @@ -326,7 +326,7 @@ namespace detail { m_rowstart[i] = current_edge; g_vertex v = ordered_verts_of_g[i]; g_out_edge_iter ei, ei_end; - for (tie(ei, ei_end) = out_edges(v, g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(v, g); ei != ei_end; ++ei) { m_column[current_edge++] = get(vi, target(*ei, g)); } } diff --git a/include/boost/graph/detail/sparse_ordering.hpp b/include/boost/graph/detail/sparse_ordering.hpp index 593d8c85..7a7350e6 100644 --- a/include/boost/graph/detail/sparse_ordering.hpp +++ b/include/boost/graph/detail/sparse_ordering.hpp @@ -137,7 +137,7 @@ namespace boost { sparse::rcm_queue Q(degree); typename boost::graph_traits::vertex_iterator ui, ui_end; - for (tie(ui, ui_end) = vertices(G); ui != ui_end; ++ui) + for (boost::tie(ui, ui_end) = vertices(G); ui != ui_end; ++ui) if (get(color, *ui) != Color::red()) put(color, *ui, Color::white()); breadth_first_visit(G, u, buffer(Q).color_map(color)); diff --git a/include/boost/graph/dijkstra_shortest_paths.hpp b/include/boost/graph/dijkstra_shortest_paths.hpp index d7456734..5b39cb38 100644 --- a/include/boost/graph/dijkstra_shortest_paths.hpp +++ b/include/boost/graph/dijkstra_shortest_paths.hpp @@ -372,7 +372,7 @@ namespace boost { typedef typename property_traits::value_type ColorValue; typedef color_traits Color; typename graph_traits::vertex_iterator ui, ui_end; - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { vis.initialize_vertex(*ui, g); put(distance, *ui, inf); put(predecessor, *ui, *ui); diff --git a/include/boost/graph/directed_graph.hpp b/include/boost/graph/directed_graph.hpp index 28b085dd..ceb3d6e3 100644 --- a/include/boost/graph/directed_graph.hpp +++ b/include/boost/graph/directed_graph.hpp @@ -194,7 +194,7 @@ public: // find all edges, (u, v) std::vector edges; out_edge_iterator i, i_end; - for(tie(i, i_end) = boost::out_edges(u, m_graph); i != i_end; ++i) { + for(boost::tie(i, i_end) = boost::out_edges(u, m_graph); i != i_end; ++i) { if(boost::target(*i, m_graph) == v) { edges.push_back(*i); } @@ -225,7 +225,7 @@ public: renumber_vertex_indices() { vertex_iterator i, end; - tie(i, end) = vertices(m_graph); + boost::tie(i, end) = vertices(m_graph); m_max_vertex_index = renumber_vertex_indices(i, end, 0); } @@ -248,7 +248,7 @@ public: renumber_edge_indices() { edge_iterator i, end; - tie(i, end) = edges(m_graph); + boost::tie(i, end) = edges(m_graph); m_max_edge_index = renumber_edge_indices(i, end, 0); } diff --git a/include/boost/graph/dominator_tree.hpp b/include/boost/graph/dominator_tree.hpp index 0c19a407..db40cb73 100644 --- a/include/boost/graph/dominator_tree.hpp +++ b/include/boost/graph/dominator_tree.hpp @@ -118,7 +118,7 @@ namespace boost { // For each predecessor of n typename graph_traits::in_edge_iterator inItr, inEnd; - for (tie(inItr, inEnd) = in_edges(n, g); inItr != inEnd; ++inItr) + for (boost::tie(inItr, inEnd) = in_edges(n, g); inItr != inEnd; ++inItr) { const Vertex v = source(*inItr, g); // To deal with unreachable nodes @@ -396,7 +396,7 @@ namespace boost { if (numOfVertices == 0) return; vertexItr vi, viend; - tie(vi, viend) = vertices(g); + boost::tie(vi, viend) = vertices(g); const std::set N(vi, viend); bool change = true; @@ -409,14 +409,14 @@ namespace boost { while (change) { change = false; - for (tie(vi, viend) = vertices(g); vi != viend; ++vi) + for (boost::tie(vi, viend) = vertices(g); vi != viend; ++vi) { if (*vi == entry) continue; std::set T(N); typename graph_traits::in_edge_iterator inItr, inEnd; - for (tie(inItr, inEnd) = in_edges(*vi, g); inItr != inEnd; ++inItr) + for (boost::tie(inItr, inEnd) = in_edges(*vi, g); inItr != inEnd; ++inItr) { const Vertex p = source(*inItr, g); @@ -434,16 +434,16 @@ namespace boost { change = true; get(domMap, *vi).swap(T); } - } // end of for (tie(vi, viend) = vertices(g) + } // end of for (boost::tie(vi, viend) = vertices(g) } // end of while(change) // 2. Build dominator tree - for (tie(vi, viend) = vertices(g); vi != viend; ++vi) + for (boost::tie(vi, viend) = vertices(g); vi != viend; ++vi) get(domMap, *vi).erase(*vi); Graph domTree(numOfVertices); - for (tie(vi, viend) = vertices(g); vi != viend; ++vi) + for (boost::tie(vi, viend) = vertices(g); vi != viend; ++vi) { if (*vi == entry) continue; @@ -464,7 +464,7 @@ namespace boost { } } - for (tie(vi, viend) = vertices(g); vi != viend; ++vi) + for (boost::tie(vi, viend) = vertices(g); vi != viend; ++vi) { if (*vi != entry && get(domMap, *vi).size() == 1) { diff --git a/include/boost/graph/eccentricity.hpp b/include/boost/graph/eccentricity.hpp index 6043477e..99f80a45 100644 --- a/include/boost/graph/eccentricity.hpp +++ b/include/boost/graph/eccentricity.hpp @@ -58,8 +58,8 @@ all_eccentricities(const Graph& g, const DistanceMatrix& dist, EccentricityMap e r = numeric_values::infinity(), d = numeric_values::zero(); VertexIterator i, end; - tie(i, end) = vertices(g); - for(tie(i, end) = vertices(g); i != end; ++i) { + boost::tie(i, end) = vertices(g); + for(boost::tie(i, end) = vertices(g); i != end; ++i) { DistanceMap dm = get(dist, *i); Eccentricity e = eccentricity(g, dm); put(ecc, *i, e); @@ -85,7 +85,7 @@ radius_and_diameter(const Graph& g, EccentricityMap ecc) BOOST_USING_STD_MAX(); VertexIterator i, end; - tie(i, end) = vertices(g); + boost::tie(i, end) = vertices(g); Eccentricity radius = get(ecc, *i); Eccentricity diameter = get(ecc, *i); for(i = boost::next(i); i != end; ++i) { diff --git a/include/boost/graph/edge_connectivity.hpp b/include/boost/graph/edge_connectivity.hpp index 383ad635..e255d84b 100644 --- a/include/boost/graph/edge_connectivity.hpp +++ b/include/boost/graph/edge_connectivity.hpp @@ -34,7 +34,7 @@ namespace boost { size_type delta = (std::numeric_limits::max)(); typename Traits::vertex_iterator i, iend; - for (tie(i, iend) = vertices(g); i != iend; ++i) + for (boost::tie(i, iend) = vertices(g); i != iend; ++i) if (degree(*i, g) < delta) { delta = degree(*i, g); p = *i; @@ -48,7 +48,7 @@ namespace boost { OutputIterator result) { typename graph_traits::adjacency_iterator ai, aend; - for (tie(ai, aend) = adjacent_vertices(u, g); ai != aend; ++ai) + for (boost::tie(ai, aend) = adjacent_vertices(u, g); ai != aend; ++ai) *result++ = *ai; } @@ -111,11 +111,11 @@ namespace boost { typename property_map::type rev_edge = get(edge_reverse, flow_g); - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { u = source(*ei, g), v = target(*ei, g); - tie(e1, inserted) = add_edge(u, v, flow_g); + boost::tie(e1, inserted) = add_edge(u, v, flow_g); cap[e1] = 1; - tie(e2, inserted) = add_edge(v, u, flow_g); + boost::tie(e2, inserted) = add_edge(v, u, flow_g); cap[e2] = 1; // not sure about this rev_edge[e1] = e2; rev_edge[e2] = e1; @@ -124,7 +124,7 @@ namespace boost { //------------------------------------------------------------------------- // The Algorithm - tie(p, delta) = detail::min_degree_vertex(g); + boost::tie(p, delta) = detail::min_degree_vertex(g); S_star.push_back(p); alpha_star = delta; S.insert(p); @@ -132,7 +132,7 @@ namespace boost { detail::neighbors(g, S.begin(), S.end(), std::inserter(neighbor_S, neighbor_S.begin())); - tie(vi, vi_end) = vertices(g); + boost::tie(vi, vi_end) = vertices(g); std::set_difference(vi, vi_end, neighbor_S.begin(), neighbor_S.end(), std::back_inserter(non_neighbor_S)); @@ -146,7 +146,7 @@ namespace boost { if (alpha_S_k < alpha_star) { alpha_star = alpha_S_k; S_star.clear(); - for (tie(vi, vi_end) = vertices(flow_g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(flow_g); vi != vi_end; ++vi) if (color[*vi] != Color::white()) S_star.push_back(*vi); } @@ -154,7 +154,7 @@ namespace boost { neighbor_S.insert(k); detail::neighbors(g, k, std::inserter(neighbor_S, neighbor_S.begin())); non_neighbor_S.clear(); - tie(vi, vi_end) = vertices(g); + boost::tie(vi, vi_end) = vertices(g); std::set_difference(vi, vi_end, neighbor_S.begin(), neighbor_S.end(), std::back_inserter(non_neighbor_S)); @@ -169,7 +169,7 @@ namespace boost { degree_size_type c = 0; for (si = S_star.begin(); si != S_star.end(); ++si) { out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(*si, g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = out_edges(*si, g); ei != ei_end; ++ei) if (!in_S_star[target(*ei, g)]) { *disconnecting_set++ = *ei; ++c; diff --git a/include/boost/graph/edmonds_karp_max_flow.hpp b/include/boost/graph/edmonds_karp_max_flow.hpp index fed4d69f..43cc592d 100644 --- a/include/boost/graph/edmonds_karp_max_flow.hpp +++ b/include/boost/graph/edmonds_karp_max_flow.hpp @@ -92,8 +92,8 @@ namespace boost { typename graph_traits::vertex_iterator u_iter, u_end; typename graph_traits::out_edge_iterator ei, e_end; - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) - for (tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) + for (boost::tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) res[*ei] = cap[*ei]; color[sink] = Color::gray(); @@ -108,7 +108,7 @@ namespace boost { } // while typename property_traits::value_type flow = 0; - for (tie(ei, e_end) = out_edges(src, g); ei != e_end; ++ei) + for (boost::tie(ei, e_end) = out_edges(src, g); ei != e_end; ++ei) flow += (cap[*ei] - res[*ei]); return flow; } // edmonds_karp_max_flow() diff --git a/include/boost/graph/filtered_graph.hpp b/include/boost/graph/filtered_graph.hpp index 30b34335..43461410 100644 --- a/include/boost/graph/filtered_graph.hpp +++ b/include/boost/graph/filtered_graph.hpp @@ -279,7 +279,7 @@ namespace boost { { typedef filtered_graph Graph; typename graph_traits::vertex_iterator f, l; - tie(f, l) = vertices(g.m_g); + boost::tie(f, l) = vertices(g.m_g); typedef typename Graph::vertex_iterator iter; return std::make_pair(iter(g.m_vertex_pred, f, l), iter(g.m_vertex_pred, l, l)); @@ -293,7 +293,7 @@ namespace boost { typedef filtered_graph Graph; typename Graph::EdgePred pred(g.m_edge_pred, g.m_vertex_pred, g); typename graph_traits::edge_iterator f, l; - tie(f, l) = edges(g.m_g); + boost::tie(f, l) = edges(g.m_g); typedef typename Graph::edge_iterator iter; return std::make_pair(iter(pred, f, l), iter(pred, l, l)); } @@ -308,7 +308,7 @@ namespace boost { // // However, the current solution is still unsatisfactory because // the following semantic constraints no longer hold: - // tie(vi, viend) = vertices(g); + // boost::tie(vi, viend) = vertices(g); // assert(std::distance(vi, viend) == num_vertices(g)); template @@ -349,7 +349,7 @@ namespace boost { typename Graph::OutEdgePred pred(g.m_edge_pred, g.m_vertex_pred, g); typedef typename Graph::out_edge_iterator iter; typename graph_traits::out_edge_iterator f, l; - tie(f, l) = out_edges(u, g.m_g); + boost::tie(f, l) = out_edges(u, g.m_g); return std::make_pair(iter(pred, f, l), iter(pred, l, l)); } @@ -360,7 +360,7 @@ namespace boost { { typename filtered_graph::degree_size_type n = 0; typename filtered_graph::out_edge_iterator f, l; - for (tie(f, l) = out_edges(u, g); f != l; ++f) + for (boost::tie(f, l) = out_edges(u, g); f != l; ++f) ++n; return n; } @@ -374,7 +374,7 @@ namespace boost { typedef filtered_graph Graph; typedef typename Graph::adjacency_iterator adjacency_iterator; typename Graph::out_edge_iterator f, l; - tie(f, l) = out_edges(u, g); + boost::tie(f, l) = out_edges(u, g); return std::make_pair(adjacency_iterator(f, const_cast(&g)), adjacency_iterator(l, const_cast(&g))); } @@ -389,7 +389,7 @@ namespace boost { typename Graph::InEdgePred pred(g.m_edge_pred, g.m_vertex_pred, g); typedef typename Graph::in_edge_iterator iter; typename graph_traits::in_edge_iterator f, l; - tie(f, l) = in_edges(u, g.m_g); + boost::tie(f, l) = in_edges(u, g.m_g); return std::make_pair(iter(pred, f, l), iter(pred, l, l)); } @@ -400,7 +400,7 @@ namespace boost { { typename filtered_graph::degree_size_type n = 0; typename filtered_graph::in_edge_iterator f, l; - for (tie(f, l) = in_edges(u, g); f != l; ++f) + for (boost::tie(f, l) = in_edges(u, g); f != l; ++f) ++n; return n; } @@ -413,7 +413,7 @@ namespace boost { { typename graph_traits::edge_descriptor e; bool exists; - tie(e, exists) = edge(u, v, g.m_g); + boost::tie(e, exists) = edge(u, v, g.m_g); return std::make_pair(e, exists && g.m_edge_pred(e)); } @@ -428,7 +428,7 @@ namespace boost { typename Graph::OutEdgePred pred(g.m_edge_pred, g.m_vertex_pred, g); typedef typename Graph::out_edge_iterator iter; typename graph_traits::out_edge_iterator f, l; - tie(f, l) = edge_range(u, v, g.m_g); + boost::tie(f, l) = edge_range(u, v, g.m_g); return std::make_pair(iter(pred, f, l), iter(pred, l, l)); } diff --git a/include/boost/graph/floyd_warshall_shortest.hpp b/include/boost/graph/floyd_warshall_shortest.hpp index 87c3453b..48dba712 100644 --- a/include/boost/graph/floyd_warshall_shortest.hpp +++ b/include/boost/graph/floyd_warshall_shortest.hpp @@ -57,10 +57,10 @@ namespace boost i, lasti, j, lastj, k, lastk; - for (tie(k, lastk) = vertices(g); k != lastk; k++) - for (tie(i, lasti) = vertices(g); i != lasti; i++) + for (boost::tie(k, lastk) = vertices(g); k != lastk; k++) + for (boost::tie(i, lasti) = vertices(g); i != lasti; i++) if(d[*i][*k] != inf) - for (tie(j, lastj) = vertices(g); j != lastj; j++) + for (boost::tie(j, lastj) = vertices(g); j != lastj; j++) if(d[*k][*j] != inf) d[*i][*j] = detail::min_with_compare(d[*i][*j], @@ -68,7 +68,7 @@ namespace boost compare); - for (tie(i, lasti) = vertices(g); i != lasti; i++) + for (boost::tie(i, lasti) = vertices(g); i != lasti; i++) if (compare(d[*i][*i], zero)) return false; return true; @@ -110,16 +110,16 @@ namespace boost typename graph_traits::edge_iterator first, last; - for(tie(firstv, lastv) = vertices(g); firstv != lastv; firstv++) - for(tie(firstv2, lastv2) = vertices(g); firstv2 != lastv2; firstv2++) + for(boost::tie(firstv, lastv) = vertices(g); firstv != lastv; firstv++) + for(boost::tie(firstv2, lastv2) = vertices(g); firstv2 != lastv2; firstv2++) d[*firstv][*firstv2] = inf; - for(tie(firstv, lastv) = vertices(g); firstv != lastv; firstv++) + for(boost::tie(firstv, lastv) = vertices(g); firstv != lastv; firstv++) d[*firstv][*firstv] = zero; - for(tie(first, last) = edges(g); first != last; first++) + for(boost::tie(first, last) = edges(g); first != last; first++) { if (d[source(*first, g)][target(*first, g)] != inf) { d[source(*first, g)][target(*first, g)] = @@ -136,7 +136,7 @@ namespace boost undirected_tag>::value; if (is_undirected) { - for(tie(first, last) = edges(g); first != last; first++) + for(boost::tie(first, last) = edges(g); first != last; first++) { if (d[target(*first, g)][source(*first, g)] != inf) d[target(*first, g)][source(*first, g)] = diff --git a/include/boost/graph/fruchterman_reingold.hpp b/include/boost/graph/fruchterman_reingold.hpp index 0da35167..4ce502e8 100644 --- a/include/boost/graph/fruchterman_reingold.hpp +++ b/include/boost/graph/fruchterman_reingold.hpp @@ -78,7 +78,7 @@ struct all_force_pairs { typedef typename graph_traits::vertex_iterator vertex_iterator; vertex_iterator v, end; - for (tie(v, end) = vertices(g); v != end; ++v) { + for (boost::tie(v, end) = vertices(g); v != end; ++v) { vertex_iterator u = v; for (++u; u != end; ++u) { apply_force(*u, *v); @@ -116,7 +116,7 @@ struct grid_force_pairs std::size_t rows = std::size_t(topology.extent()[1] / two_k + 1.); buckets_t buckets(rows * columns); vertex_iterator v, v_end; - for (tie(v, v_end) = vertices(g); v != v_end; ++v) { + for (boost::tie(v, v_end) = vertices(g); v != v_end; ++v) { std::size_t column = std::size_t((get(position, *v)[0] + topology.extent()[0] / 2) / two_k); std::size_t row = @@ -299,13 +299,13 @@ fruchterman_reingold_force_directed_layout do { // Calculate repulsive forces vertex_iterator v, v_end; - for (tie(v, v_end) = vertices(g); v != v_end; ++v) + for (boost::tie(v, v_end) = vertices(g); v != v_end; ++v) put(displacement, *v, typename Topology::point_difference_type()); force_pairs(g, apply_force); // Calculate attractive forces edge_iterator e, e_end; - for (tie(e, e_end) = edges(g); e != e_end; ++e) { + for (boost::tie(e, e_end) = edges(g); e != e_end; ++e) { vertex_descriptor v = source(*e, g); vertex_descriptor u = target(*e, g); diff --git a/include/boost/graph/graph_stats.hpp b/include/boost/graph/graph_stats.hpp index 47c05025..636c4913 100644 --- a/include/boost/graph/graph_stats.hpp +++ b/include/boost/graph/graph_stats.hpp @@ -77,7 +77,7 @@ std::map dup_edge_dist( Graph& g ) { BGL_FORALL_VERTICES_T( v, g, Graph ) { std::list front_neighbors; a_iterator_type a_iter, a_end; - for( tie( a_iter, a_end ) = adjacent_vertices( v, g ); + for( boost::tie( a_iter, a_end ) = adjacent_vertices( v, g ); a_iter != a_end; ++a_iter ) { front_neighbors.push_back( *a_iter ); } diff --git a/include/boost/graph/graph_utility.hpp b/include/boost/graph/graph_utility.hpp index 9976074c..ba1fe3d8 100644 --- a/include/boost/graph/graph_utility.hpp +++ b/include/boost/graph/graph_utility.hpp @@ -157,11 +157,11 @@ namespace boost { void print_in_edges(const IncidenceGraph& G, Name name) { typename graph_traits::vertex_iterator ui,ui_end; - for (tie(ui,ui_end) = vertices(G); ui != ui_end; ++ui) { + for (boost::tie(ui,ui_end) = vertices(G); ui != ui_end; ++ui) { std::cout << get(name,*ui) << " <-- "; typename graph_traits ::in_edge_iterator ei, ei_end; - for(tie(ei,ei_end) = in_edges(*ui,G); ei != ei_end; ++ei) + for(boost::tie(ei,ei_end) = in_edges(*ui,G); ei != ei_end; ++ei) std::cout << get(name,source(*ei,G)) << " "; std::cout << std::endl; } @@ -171,11 +171,11 @@ namespace boost { void print_graph_dispatch(const IncidenceGraph& G, Name name, directed_tag) { typename graph_traits::vertex_iterator ui,ui_end; - for (tie(ui,ui_end) = vertices(G); ui != ui_end; ++ui) { + for (boost::tie(ui,ui_end) = vertices(G); ui != ui_end; ++ui) { std::cout << get(name,*ui) << " --> "; typename graph_traits ::out_edge_iterator ei, ei_end; - for(tie(ei,ei_end) = out_edges(*ui,G); ei != ei_end; ++ei) + for(boost::tie(ei,ei_end) = out_edges(*ui,G); ei != ei_end; ++ei) std::cout << get(name,target(*ei,G)) << " "; std::cout << std::endl; } @@ -184,11 +184,11 @@ namespace boost { void print_graph_dispatch(const IncidenceGraph& G, Name name, undirected_tag) { typename graph_traits::vertex_iterator ui,ui_end; - for (tie(ui,ui_end) = vertices(G); ui != ui_end; ++ui) { + for (boost::tie(ui,ui_end) = vertices(G); ui != ui_end; ++ui) { std::cout << get(name,*ui) << " <--> "; typename graph_traits ::out_edge_iterator ei, ei_end; - for(tie(ei,ei_end) = out_edges(*ui,G); ei != ei_end; ++ei) + for(boost::tie(ei,ei_end) = out_edges(*ui,G); ei != ei_end; ++ei) std::cout << get(name,target(*ei,G)) << " "; std::cout << std::endl; } @@ -209,7 +209,7 @@ namespace boost { void print_edges(const EdgeListGraph& G, Name name) { typename graph_traits::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(G); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(G); ei != ei_end; ++ei) std::cout << "(" << get(name, source(*ei, G)) << "," << get(name, target(*ei, G)) << ") "; std::cout << std::endl; @@ -219,7 +219,7 @@ namespace boost { void print_edges2(const EdgeListGraph& G, VertexName vname, EdgeName ename) { typename graph_traits::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(G); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(G); ei != ei_end; ++ei) std::cout << get(ename, *ei) << "(" << get(vname, source(*ei, G)) << "," << get(vname, target(*ei, G)) << ") "; std::cout << std::endl; @@ -229,7 +229,7 @@ namespace boost { void print_vertices(const VertexListGraph& G, Name name) { typename graph_traits::vertex_iterator vi,vi_end; - for (tie(vi,vi_end) = vertices(G); vi != vi_end; ++vi) + for (boost::tie(vi,vi_end) = vertices(G); vi != vi_end; ++vi) std::cout << get(name,*vi) << " "; std::cout << std::endl; } @@ -241,21 +241,21 @@ namespace boost { edge_descriptor; typename graph_traits::adjacency_iterator vi, viend, adj_found; - tie(vi, viend) = adjacent_vertices(a, g); + boost::tie(vi, viend) = adjacent_vertices(a, g); adj_found = std::find(vi, viend, b); if (adj_found == viend) return false; typename graph_traits::out_edge_iterator oi, oiend, out_found; - tie(oi, oiend) = out_edges(a, g); + boost::tie(oi, oiend) = out_edges(a, g); out_found = std::find_if(oi, oiend, incident_to(b, g)); if (out_found == oiend) return false; typename graph_traits::in_edge_iterator ii, iiend, in_found; - tie(ii, iiend) = in_edges(b, g); + boost::tie(ii, iiend) = in_edges(b, g); in_found = std::find_if(ii, iiend, incident_from(a, g)); if (in_found == iiend) return false; @@ -268,7 +268,7 @@ namespace boost { typedef typename graph_traits::edge_descriptor edge_descriptor; typename graph_traits::adjacency_iterator vi, viend, found; - tie(vi, viend) = adjacent_vertices(a, g); + boost::tie(vi, viend) = adjacent_vertices(a, g); #if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 && defined(__SGI_STL_PORT) // Getting internal compiler error with std::find() found = viend; @@ -285,7 +285,7 @@ namespace boost { typename graph_traits::out_edge_iterator oi, oiend, out_found; - tie(oi, oiend) = out_edges(a, g); + boost::tie(oi, oiend) = out_edges(a, g); #if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 && defined(__SGI_STL_PORT) // Getting internal compiler error with std::find() @@ -318,7 +318,7 @@ namespace boost { bool in_edge_set(Graph& g, Edge e) { typename Graph::edge_iterator ei, ei_end, found; - tie(ei, ei_end) = edges(g); + boost::tie(ei, ei_end) = edges(g); found = std::find(ei, ei_end, e); return found != ei_end; } @@ -327,7 +327,7 @@ namespace boost { bool in_vertex_set(Graph& g, Vertex v) { typename Graph::vertex_iterator vi, vi_end, found; - tie(vi, vi_end) = vertices(g); + boost::tie(vi, vi_end) = vertices(g); found = std::find(vi, vi_end, v); return found != vi_end; } @@ -336,7 +336,7 @@ namespace boost { bool in_edge_set(Graph& g, Vertex u, Vertex v) { typename Graph::edge_iterator ei, ei_end; - for (tie(ei,ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei) if (source(*ei,g) == u && target(*ei,g) == v) return true; return false; @@ -380,10 +380,10 @@ namespace boost { typedef color_traits Color; typename graph_traits::vertex_iterator ui, ui_end, vi, vi_end, ci, ci_end; - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) if (*ui != *vi) { - for (tie(ci, ci_end) = vertices(g); ci != ci_end; ++ci) + for (boost::tie(ci, ci_end) = vertices(g); ci != ci_end; ++ci) put(color, *ci, Color::white()); if (! is_reachable(*ui, *vi, g, color)) return false; diff --git a/include/boost/graph/graphml.hpp b/include/boost/graph/graphml.hpp index b4955b88..6afa12c9 100644 --- a/include/boost/graph/graphml.hpp +++ b/include/boost/graph/graphml.hpp @@ -296,7 +296,7 @@ write_graphml(std::ostream& out, const Graph& g, VertexIndexMap vertex_index, typedef typename graph_traits::vertex_iterator vertex_iterator; vertex_iterator v, v_end; - for (tie(v, v_end) = vertices(g); v != v_end; ++v) + for (boost::tie(v, v_end) = vertices(g); v != v_end; ++v) { out << " \n"; // Output data @@ -314,7 +314,7 @@ write_graphml(std::ostream& out, const Graph& g, VertexIndexMap vertex_index, typedef typename graph_traits::edge_iterator edge_iterator; edge_iterator e, e_end; typename graph_traits::edges_size_type edge_count = 0; - for (tie(e, e_end) = edges(g); e != e_end; ++e) + for (boost::tie(e, e_end) = edges(g); e != e_end; ++e) { out << " ::vertex_iterator i, end; - for(tie(i,end) = vertices(g); i != end; ++i) { + for(boost::tie(i,end) = vertices(g); i != end; ++i) { out << get(vertex_id, *i); vpw(out, *i); //print vertex attributes out << ";" << std::endl; } typename graph_traits::edge_iterator ei, edge_end; - for(tie(ei, edge_end) = edges(g); ei != edge_end; ++ei) { + for(boost::tie(ei, edge_end) = edges(g); ei != edge_end; ++ei) { out << get(vertex_id, source(*ei, g)) << Traits::delimiter() << get(vertex_id, target(*ei, g)) << " "; epw(out, *ei); //print edge attributes out << ";" << std::endl; @@ -346,7 +346,7 @@ namespace boost { #endif //print subgraph - for ( tie(i_child,j_child) = g.children(); + for ( boost::tie(i_child,j_child) = g.children(); i_child != j_child; ++i_child ) write_graphviz_subgraph(out, *i_child, vertex_marker, edge_marker, vertex_id); @@ -356,7 +356,7 @@ namespace boost { typename graph_traits::vertex_iterator i, end; typename graph_traits::edge_iterator ei, edge_end; - for(tie(i,end) = vertices(g); i != end; ++i) { + for(boost::tie(i,end) = vertices(g); i != end; ++i) { Vertex v = g.local_to_global(*i); int pos = get(vertex_id, v); if ( vertex_marker[pos] ) { @@ -375,7 +375,7 @@ namespace boost { } } - for (tie(ei, edge_end) = edges(g); ei != edge_end; ++ei) { + for (boost::tie(ei, edge_end) = edges(g); ei != edge_end; ++ei) { Vertex u = g.local_to_global(source(*ei,g)), v = g.local_to_global(target(*ei, g)); int pos = get(get(edge_index, g.root()), g.local_to_global(*ei)); diff --git a/include/boost/graph/howard_cycle_ratio.hpp b/include/boost/graph/howard_cycle_ratio.hpp index 119499a3..09c6522b 100644 --- a/include/boost/graph/howard_cycle_ratio.hpp +++ b/include/boost/graph/howard_cycle_ratio.hpp @@ -187,9 +187,9 @@ namespace boost { float_t cz = (std::numeric_limits::max)(); //Closest to zero value float_t s = 0; const float_t eps_ = std::numeric_limits::epsilon(); - for (tie(vi, vie) = vertices(m_g); vi != vie; ++vi) + for (boost::tie(vi, vie) = vertices(m_g); vi != vie; ++vi) { - for (tie(oei, oeie) = out_edges(*vi, m_g); oei != oeie; ++oei) + for (boost::tie(oei, oeie) = out_edges(*vi, m_g); oei != oeie; ++oei) { s += std::abs(m_ew1m[*oei]); float_t a = std::abs(m_ew2m[*oei]); @@ -211,9 +211,9 @@ namespace boost { m_sink = graph_traits().null_vertex(); typename graph_traits::vertex_iterator vi, vie; typename graph_traits::out_edge_iterator oei, oeie; - for ( tie(vi, vie) = vertices(m_g); vi != vie; ++vi ) + for ( boost::tie(vi, vie) = vertices(m_g); vi != vie; ++vi ) { - tie(oei, oeie) = out_edges(*vi, m_g); + boost::tie(oei, oeie) = out_edges(*vi, m_g); typename graph_traits::out_edge_iterator mei = std::max_element(oei, oeie, boost::bind(m_cmp, @@ -331,7 +331,7 @@ namespace boost { std::fill(m_col_bfs.begin(), m_col_bfs.end(), my_white); color_map_t vcm_ = color_map_t(m_col_bfs.begin(), m_vim); typename graph_traits::vertex_iterator uv_itr, vie; - tie(uv_itr, vie) = vertices(m_g); + boost::tie(uv_itr, vie) = vertices(m_g); float_t mcr = m_bound; while ( (uv_itr = std::find_if(uv_itr, vie, boost::bind(std::equal_to(), @@ -373,11 +373,11 @@ namespace boost { typename graph_traits::vertex_iterator vi, vie; typename graph_traits::out_edge_iterator oei, oeie; const float_t eps_ = FloatTraits::epsilon(); - for (tie(vi, vie) = vertices(m_g); vi != vie; ++vi) + for (boost::tie(vi, vie) = vertices(m_g); vi != vie; ++vi) { if (!m_badv[*vi]) { - for (tie(oei, oeie) = out_edges(*vi, m_g); oei != oeie; ++oei) + for (boost::tie(oei, oeie) = out_edges(*vi, m_g); oei != oeie; ++oei) { vertex_t t = target(*oei, m_g); //Current distance from *vi to some vertex diff --git a/include/boost/graph/incremental_components.hpp b/include/boost/graph/incremental_components.hpp index f56c60d5..fff3a324 100644 --- a/include/boost/graph/incremental_components.hpp +++ b/include/boost/graph/incremental_components.hpp @@ -55,7 +55,7 @@ namespace boost { void incremental_components(EdgeListGraph& g, DisjointSets& ds) { typename graph_traits::edge_iterator e, end; - for (tie(e,end) = edges(g); e != end; ++e) + for (boost::tie(e,end) = edges(g); e != end; ++e) ds.union_set(source(*e,g),target(*e,g)); } @@ -91,7 +91,7 @@ namespace boost { { typename graph_traits ::vertex_iterator v, vend; - for (tie(v, vend) = vertices(G); v != vend; ++v) + for (boost::tie(v, vend) = vertices(G); v != vend; ++v) ds.make_set(*v); } diff --git a/include/boost/graph/johnson_all_pairs_shortest.hpp b/include/boost/graph/johnson_all_pairs_shortest.hpp index 0720411c..8aec5005 100644 --- a/include/boost/graph/johnson_all_pairs_shortest.hpp +++ b/include/boost/graph/johnson_all_pairs_shortest.hpp @@ -74,21 +74,21 @@ namespace boost { { typename Traits1::vertex_iterator v, v_end; int i = 1; - for (tie(v, v_end) = vertices(g1); v != v_end; ++v, ++i) { + for (boost::tie(v, v_end) = vertices(g1); v != v_end; ++v, ++i) { typename Traits2::edge_descriptor e; bool z; - tie(e, z) = add_edge(s, get(id1, *v) + 1, g2); + boost::tie(e, z) = add_edge(s, get(id1, *v) + 1, g2); put(w, e, zero); verts1[i] = *v; } typename Traits1::edge_iterator e, e_end; - for (tie(e, e_end) = edges(g1); e != e_end; ++e) { + for (boost::tie(e, e_end) = edges(g1); e != e_end; ++e) { typename Traits2::edge_descriptor e2; bool z; - tie(e2, z) = add_edge(get(id1, source(*e, g1)) + 1, - get(id1, target(*e, g1)) + 1, g2); + boost::tie(e2, z) = add_edge(get(id1, source(*e, g1)) + 1, + get(id1, target(*e, g1)) + 1, g2); put(w, e2, get(w1, *e)); if (is_undirected) { - tie(e2, z) = add_edge(get(id1, target(*e, g1)) + 1, - get(id1, source(*e, g1)) + 1, g2); + boost::tie(e2, z) = add_edge(get(id1, target(*e, g1)) + 1, + get(id1, source(*e, g1)) + 1, g2); put(w, e2, get(w1, *e)); } } @@ -97,7 +97,7 @@ namespace boost { typename Traits2::edge_iterator e, e_end; shared_array_property_map h(num_vertices(g2), id2); - for (tie(v, v_end) = vertices(g2); v != v_end; ++v) + for (boost::tie(v, v_end) = vertices(g2); v != v_end; ++v) put(d, *v, inf); put(d, s, zero); @@ -106,19 +106,19 @@ namespace boost { dummy_property_map pred; bellman_visitor<> bvis; if (bellman_ford_shortest_paths (g2, num_vertices(g2), w, pred, d, combine, compare, bvis)) { - for (tie(v, v_end) = vertices(g2); v != v_end; ++v) + for (boost::tie(v, v_end) = vertices(g2); v != v_end; ++v) put(h, *v, get(d, *v)); // Reweight the edges to remove negatives - for (tie(e, e_end) = edges(g2); e != e_end; ++e) { + for (boost::tie(e, e_end) = edges(g2); e != e_end; ++e) { typename Traits2::vertex_descriptor a = source(*e, g2), b = target(*e, g2); put(w_hat, *e, combine(get(w, *e), (get(h, a) - get(h, b)))); } - for (tie(u, u_end) = vertices(g2); u != u_end; ++u) { + for (boost::tie(u, u_end) = vertices(g2); u != u_end; ++u) { dijkstra_visitor<> dvis; dijkstra_shortest_paths (g2, *u, pred, d, w_hat, id2, compare, combine, inf, zero,dvis); - for (tie(v, v_end) = vertices(g2); v != v_end; ++v) { + for (boost::tie(v, v_end) = vertices(g2); v != v_end; ++v) { if (*u != s && *v != s) { typename Traits1::vertex_descriptor u1, v1; u1 = verts1[get(id2, *u)]; v1 = verts1[get(id2, *v)]; diff --git a/include/boost/graph/king_ordering.hpp b/include/boost/graph/king_ordering.hpp index 77497273..9d9a438f 100644 --- a/include/boost/graph/king_ordering.hpp +++ b/include/boost/graph/king_ordering.hpp @@ -59,7 +59,7 @@ namespace boost { for( ; rbegin != rend; rend--){ percolate_down(i); w = (*Qptr)[index_begin+i]; - for (tie(ei, ei_end) = out_edges(w, g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(w, g); ei != ei_end; ++ei) { v = target(*ei, g); put(degree, v, get(degree, v) - 1); @@ -212,7 +212,7 @@ namespace boost { queue Q; // Copy degree to pseudo_degree // initialize the color map - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui){ + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui){ put(pseudo_degree, *ui, get(degree, *ui)); put(color, *ui, Color::white()); } diff --git a/include/boost/graph/kolmogorov_max_flow.hpp b/include/boost/graph/kolmogorov_max_flow.hpp index a89906df..ae476f32 100644 --- a/include/boost/graph/kolmogorov_max_flow.hpp +++ b/include/boost/graph/kolmogorov_max_flow.hpp @@ -109,13 +109,13 @@ namespace boost { m_last_grow_vertex(graph_traits::null_vertex()){ // initialize the color-map with gray-values vertex_iterator vi, v_end; - for(tie(vi, v_end) = vertices(m_g); vi != v_end; ++vi){ + for(boost::tie(vi, v_end) = vertices(m_g); vi != v_end; ++vi){ set_tree(*vi, tColorTraits::gray()); } // Initialize flow to zero which means initializing // the residual capacity equal to the capacity edge_iterator ei, e_end; - for(tie(ei, e_end) = edges(m_g); ei != e_end; ++ei) { + for(boost::tie(ei, e_end) = edges(m_g); ei != e_end; ++ei) { m_res_cap_map[*ei] = m_cap_map[*ei]; assert(m_rev_edge_map[m_rev_edge_map[*ei]] == *ei); //check if the reverse edge map is build up properly } @@ -135,7 +135,7 @@ namespace boost { while(true){ bool path_found; edge_descriptor connecting_edge; - tie(connecting_edge, path_found) = grow(); //find a path from source to sink + boost::tie(connecting_edge, path_found) = grow(); //find a path from source to sink if(!path_found){ //we're finished, no more paths were found break; @@ -155,7 +155,7 @@ namespace boost { //this improves especially graphcuts for segmentation, as most of the nodes have source/sink connects //but shouldn't have an impact on other maxflow problems (this is done in grow() anyway) out_edge_iterator ei, e_end; - for(tie(ei, e_end) = out_edges(m_source, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(m_source, m_g); ei != e_end; ++ei){ edge_descriptor from_source = *ei; vertex_descriptor current_node = target(from_source, m_g); if(current_node == m_sink){ @@ -166,7 +166,7 @@ namespace boost { } edge_descriptor to_sink; bool is_there; - tie(to_sink, is_there) = lookup_edge(current_node, m_sink, m_g); + boost::tie(to_sink, is_there) = lookup_edge(current_node, m_sink, m_g); if(is_there){ tEdgeVal cap_from_source = m_res_cap_map[from_source]; tEdgeVal cap_to_sink = m_res_cap_map[to_sink]; @@ -203,7 +203,7 @@ namespace boost { add_active_node(current_node); } } - for(tie(ei, e_end) = out_edges(m_sink, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(m_sink, m_g); ei != e_end; ++ei){ edge_descriptor to_sink = m_rev_edge_map[*ei]; vertex_descriptor current_node = source(to_sink, m_g); if(m_res_cap_map[to_sink]){ @@ -231,7 +231,7 @@ namespace boost { out_edge_iterator ei, e_end; if(current_node != m_last_grow_vertex){ m_last_grow_vertex = current_node; - tie(m_last_grow_edge_it, m_last_grow_edge_end) = out_edges(current_node, m_g); + boost::tie(m_last_grow_edge_it, m_last_grow_edge_end) = out_edges(current_node, m_g); } for(; m_last_grow_edge_it != m_last_grow_edge_end; ++m_last_grow_edge_it){ edge_descriptor out_edge = *m_last_grow_edge_it; @@ -262,7 +262,7 @@ namespace boost { out_edge_iterator ei, e_end; if(current_node != m_last_grow_vertex){ m_last_grow_vertex = current_node; - tie(m_last_grow_edge_it, m_last_grow_edge_end) = out_edges(current_node, m_g); + boost::tie(m_last_grow_edge_it, m_last_grow_edge_end) = out_edges(current_node, m_g); } for(; m_last_grow_edge_it != m_last_grow_edge_end; ++m_last_grow_edge_it){ edge_descriptor in_edge = m_rev_edge_map[*m_last_grow_edge_it]; @@ -390,7 +390,7 @@ namespace boost { tDistanceVal min_distance = (std::numeric_limits::max)(); edge_descriptor new_parent_edge; out_edge_iterator ei, e_end; - for(tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ const edge_descriptor in_edge = m_rev_edge_map[*ei]; assert(target(in_edge, m_g) == current_node); //we should be the target of this edge if(m_res_cap_map[in_edge] > 0){ @@ -409,7 +409,7 @@ namespace boost { m_time_map[current_node] = m_time; } else{ m_time_map[current_node] = 0; - for(tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ edge_descriptor in_edge = m_rev_edge_map[*ei]; vertex_descriptor other_node = source(in_edge, m_g); if(get_tree(other_node) == tColorTraits::black() && has_parent(other_node)){ @@ -433,7 +433,7 @@ namespace boost { out_edge_iterator ei, e_end; edge_descriptor new_parent_edge; tDistanceVal min_distance = (std::numeric_limits::max)(); - for(tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ const edge_descriptor out_edge = *ei; if(m_res_cap_map[out_edge] > 0){ const vertex_descriptor other_node = target(out_edge, m_g); @@ -450,7 +450,7 @@ namespace boost { m_time_map[current_node] = m_time; } else{ m_time_map[current_node] = 0; - for(tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(current_node, m_g); ei != e_end; ++ei){ const edge_descriptor out_edge = *ei; const vertex_descriptor other_node = target(out_edge, m_g); if(get_tree(other_node) == tColorTraits::white() && has_parent(other_node)){ diff --git a/include/boost/graph/leda_graph.hpp b/include/boost/graph/leda_graph.hpp index 770874c5..687a10dd 100644 --- a/include/boost/graph/leda_graph.hpp +++ b/include/boost/graph/leda_graph.hpp @@ -481,11 +481,11 @@ namespace boost { leda::GRAPH& g) { typename graph_traits< leda::GRAPH >::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end)=out_edges(u,g); ei!=ei_end; ei++) + for (boost::tie(ei, ei_end)=out_edges(u,g); ei!=ei_end; ei++) remove_edge(*ei); typename graph_traits< leda::GRAPH >::in_edge_iterator iei, iei_end; - for (tie(iei, iei_end)=in_edges(u,g); iei!=iei_end; iei++) + for (boost::tie(iei, iei_end)=in_edges(u,g); iei!=iei_end; iei++) remove_edge(*iei); } @@ -684,11 +684,11 @@ namespace boost { leda::graph& g) { graph_traits::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end)=out_edges(u,g); ei!=ei_end; ei++) + for (boost::tie(ei, ei_end)=out_edges(u,g); ei!=ei_end; ei++) remove_edge(*ei, g); graph_traits::in_edge_iterator iei, iei_end; - for (tie(iei, iei_end)=in_edges(u,g); iei!=iei_end; iei++) + for (boost::tie(iei, iei_end)=in_edges(u,g); iei!=iei_end; iei++) remove_edge(*iei, g); } diff --git a/include/boost/graph/make_connected.hpp b/include/boost/graph/make_connected.hpp index e5e2f52c..de6c861d 100644 --- a/include/boost/graph/make_connected.hpp +++ b/include/boost/graph/make_connected.hpp @@ -46,7 +46,7 @@ namespace boost return; vertex_iterator_t vi, vi_end; - 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(), diff --git a/include/boost/graph/max_cardinality_matching.hpp b/include/boost/graph/max_cardinality_matching.hpp index 1f0f6de2..043f7014 100644 --- a/include/boost/graph/max_cardinality_matching.hpp +++ b/include/boost/graph/max_cardinality_matching.hpp @@ -43,7 +43,7 @@ namespace boost v_size_t size_of_matching = 0; vertex_iterator_t vi, vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) { vertex_descriptor_t v = *vi; if (get(mate,v) != graph_traits::null_vertex() @@ -74,7 +74,7 @@ namespace boost typedef typename graph_traits::vertex_iterator vertex_iterator_t; vertex_iterator_t vi, vi_end; - for( tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for( boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) { vertex_descriptor_t v = *vi; if (get(mate,v) != graph_traits::null_vertex() @@ -187,7 +187,7 @@ namespace boost ds(ds_rank_map, ds_parent_map) { vertex_iterator_t vi, vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) mate[*vi] = get(arg_mate, *vi); } @@ -205,7 +205,7 @@ namespace boost even_edges.clear(); vertex_iterator_t vi, vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) { vertex_descriptor_t u = *vi; @@ -219,7 +219,7 @@ namespace boost { vertex_state[u] = graph::detail::V_EVEN; out_edge_iterator_t ei, ei_end; - for(tie(ei,ei_end) = out_edges(u,g); ei != ei_end; ++ei) + for(boost::tie(ei,ei_end) = out_edges(u,g); ei != ei_end; ++ei) even_edges.push_back( *ei ); } else @@ -261,7 +261,7 @@ namespace boost vertex_state[w_prime] = graph::detail::V_ODD; vertex_state[mate[w_prime]] = graph::detail::V_EVEN; out_edge_iterator_t ei, ei_end; - for( tie(ei,ei_end) = out_edges(mate[w_prime], g); ei != ei_end; ++ei) + for( boost::tie(ei,ei_end) = out_edges(mate[w_prime], g); ei != ei_end; ++ei) even_edges.push_back(*ei); pred[w_prime] = v; } @@ -356,7 +356,7 @@ namespace boost void get_current_matching(PropertyMap pm) { vertex_iterator_t vi,vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) put(pm, *vi, mate[*vi]); } @@ -367,7 +367,7 @@ namespace boost void get_vertex_state_map(PropertyMap pm) { vertex_iterator_t vi,vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) put(pm, *vi, vertex_state[origin[ds.find_set(*vi)]]); } @@ -403,7 +403,7 @@ namespace boost { bridge[v] = the_bridge; out_edge_iterator_t oei, oei_end; - for(tie(oei, oei_end) = out_edges(v,g); oei != oei_end; ++oei) + for(boost::tie(oei, oei_end) = out_edges(v,g); oei != oei_end; ++oei) even_edges.push_back(*oei); } } @@ -520,11 +520,11 @@ namespace boost static void find_matching(const Graph& g, MateMap mate) { vertex_iterator_t vi, vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) put(mate, *vi, graph_traits::null_vertex()); edge_iterator_t ei, ei_end; - for( tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for( boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { edge_descriptor_t e = *ei; vertex_descriptor_t u = source(e,g); @@ -598,11 +598,11 @@ namespace boost directed_edges_vector_t edge_list; vertex_iterator_t vi, vi_end; - for(tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) put(mate, *vi, graph_traits::null_vertex()); edge_iterator_t ei, ei_end; - for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { edge_descriptor_t e = *ei; vertex_descriptor_t u = source(e,g); @@ -642,7 +642,7 @@ namespace boost static void find_matching(const Graph& g, MateMap mate) { vertex_iterator_t vi, vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) put(mate, *vi, graph_traits::null_vertex()); } }; @@ -791,7 +791,7 @@ namespace boost //count the number of graph::detail::V_ODD vertices v_size_t num_odd_vertices = 0; vertex_iterator_t vi, vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) if (vertex_state[*vi] == graph::detail::V_ODD) ++num_odd_vertices; diff --git a/include/boost/graph/mcgregor_common_subgraphs.hpp b/include/boost/graph/mcgregor_common_subgraphs.hpp index 51eea889..c46f7215 100644 --- a/include/boost/graph/mcgregor_common_subgraphs.hpp +++ b/include/boost/graph/mcgregor_common_subgraphs.hpp @@ -288,8 +288,8 @@ namespace boost { typename graph_traits::vertex_iterator vertex2_begin, vertex2_end, vertex2_iter; - tie(vertex1_iter, vertex1_end) = vertices(graph1); - tie(vertex2_begin, vertex2_end) = vertices(graph2); + boost::tie(vertex1_iter, vertex1_end) = vertices(graph1); + boost::tie(vertex2_begin, vertex2_end) = vertices(graph2); vertex2_iter = vertex2_begin; // Iterate until all vertices have been visited diff --git a/include/boost/graph/metric_tsp_approx.hpp b/include/boost/graph/metric_tsp_approx.hpp index 02709539..ff81b9f0 100644 --- a/include/boost/graph/metric_tsp_approx.hpp +++ b/include/boost/graph/metric_tsp_approx.hpp @@ -285,7 +285,7 @@ namespace boost // would require revisiting the core algorithm. Edge e; bool found; - tie(e, found) = lookup_edge(previous_, v, g); + boost::tie(e, found) = lookup_edge(previous_, v, g); if(!found) { BOOST_THROW_EXCEPTION(not_complete()); } diff --git a/include/boost/graph/minimum_degree_ordering.hpp b/include/boost/graph/minimum_degree_ordering.hpp index 39c3dcfb..85e6e7be 100644 --- a/include/boost/graph/minimum_degree_ordering.hpp +++ b/include/boost/graph/minimum_degree_ordering.hpp @@ -310,13 +310,13 @@ namespace boost { { typename graph_traits::vertex_iterator v, vend; size_type vid = 0; - for (tie(v, vend) = vertices(G); v != vend; ++v, ++vid) + for (boost::tie(v, vend) = vertices(G); v != vend; ++v, ++vid) index_vertex_vec[vid] = *v; index_vertex_map = IndexVertexMap(&index_vertex_vec[0]); // Initialize degreelists. Degreelists organizes the nodes // according to their degree. - for (tie(v, vend) = vertices(G); v != vend; ++v) { + for (boost::tie(v, vend) = vertices(G); v != vend; ++v) { put(degree, *v, out_degree(*v, G)); degreelists.push(*v); } @@ -409,7 +409,7 @@ namespace boost { size_type e_id = element_neighbor.top(); vertex_t element = get(index_vertex_map, e_id); adj_iter i, i_end; - for (tie(i, i_end) = adjacent_vertices(element, G); i != i_end; ++i){ + for (boost::tie(i, i_end) = adjacent_vertices(element, G); i != i_end; ++i){ vertex_t i_node = *i; if (!marker.is_tagged(i_node) && !numbering.is_numbered(i_node)) { marker.mark_tagged(i_node); @@ -419,7 +419,7 @@ namespace boost { element_neighbor.pop(); } adj_iter v, ve; - for (tie(v, ve) = adjacent_vertices(node, G); v != ve; ++v) { + for (boost::tie(v, ve) = adjacent_vertices(node, G); v != ve; ++v) { vertex_t v_node = *v; if (!degree_lists_marker.need_update(v_node) && !degree_lists_marker.outmatched_or_done(v_node)) { @@ -456,7 +456,7 @@ namespace boost { vertex_t current = get(index_vertex_map, llist.top()); adj_iter i, ie; - for (tie(i,ie) = adjacent_vertices(current, G); i != ie; ++i) { + for (boost::tie(i,ie) = adjacent_vertices(current, G); i != ie; ++i) { vertex_t i_node = *i; const size_type i_id = get(vertex_index_map, i_node); if (supernode_size[i_node] != 0) { @@ -490,7 +490,7 @@ namespace boost { } if (numbering.is_numbered(neighbor)) { adj_iter i, ie; - for (tie(i,ie) = adjacent_vertices(neighbor, G); + for (boost::tie(i,ie) = adjacent_vertices(neighbor, G); i != ie; ++i) { const vertex_t i_node = *i; if (i_node == u_node || supernode_size[i_node] == 0) @@ -536,7 +536,7 @@ namespace boost { marker.increment_tag(); deg = deg0; adj_iter i, ie; - for (tie(i, ie) = adjacent_vertices(u_node, G); i != ie; ++i) { + for (boost::tie(i, ie) = adjacent_vertices(u_node, G); i != ie; ++i) { vertex_t i_node = *i; if (marker.is_tagged(i_node)) continue; @@ -544,7 +544,7 @@ namespace boost { if (numbering.is_numbered(i_node)) { adj_iter j, je; - for (tie(j, je) = adjacent_vertices(i_node, G); j != je; ++j) { + for (boost::tie(j, je) = adjacent_vertices(i_node, G); j != je; ++j) { const vertex_t j_node = *j; if (marker.is_not_tagged(j_node)) { marker.mark_tagged(j_node); diff --git a/include/boost/graph/neighbor_bfs.hpp b/include/boost/graph/neighbor_bfs.hpp index 01cfe49b..3ed94fc5 100644 --- a/include/boost/graph/neighbor_bfs.hpp +++ b/include/boost/graph/neighbor_bfs.hpp @@ -152,7 +152,7 @@ namespace boost { vis.examine_vertex(u, g); typename GTraits::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { Edge e = *ei; vis.examine_out_edge(e, g); Vertex v = target(e, g); @@ -172,7 +172,7 @@ namespace boost { } // for out-edges typename GTraits::in_edge_iterator in_ei, in_ei_end; - for (tie(in_ei, in_ei_end) = in_edges(u, g); + for (boost::tie(in_ei, in_ei_end) = in_edges(u, g); in_ei != in_ei_end; ++in_ei) { Edge e = *in_ei; vis.examine_in_edge(e, g); @@ -216,7 +216,7 @@ namespace boost { typedef typename property_traits::value_type ColorValue; typedef color_traits Color; typename boost::graph_traits::vertex_iterator i, i_end; - for (tie(i, i_end) = vertices(g); i != i_end; ++i) { + for (boost::tie(i, i_end) = vertices(g); i != i_end; ++i) { put(color, *i, Color::white()); vis.initialize_vertex(*i, g); } diff --git a/include/boost/graph/page_rank.hpp b/include/boost/graph/page_rank.hpp index 9532260f..a8987046 100644 --- a/include/boost/graph/page_rank.hpp +++ b/include/boost/graph/page_rank.hpp @@ -142,7 +142,7 @@ remove_dangling_links(MutableGraph& g old_n = num_vertices(g); typename graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; /* in loop */) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; /* in loop */) { typename graph_traits::vertex_descriptor v = *vi++; if (out_degree(v, g) == 0) { clear_vertex(v, g); diff --git a/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp b/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp index ee31c85e..71607fcb 100644 --- a/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp +++ b/include/boost/graph/planar_detail/boyer_myrvold_impl.hpp @@ -346,7 +346,7 @@ namespace boost // the walkup and consumed by the walkdown. vertex_iterator_t vi, vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) { vertex_t v(*vi); vertex_t parent = dfs_parent[v]; @@ -471,7 +471,7 @@ namespace boost typedef typename face_vertex_iterator::type walkup_iterator_t; out_edge_iterator_t oi, oi_end; - for(tie(oi,oi_end) = out_edges(v,g); oi != oi_end; ++oi) + for(boost::tie(oi,oi_end) = out_edges(v,g); oi != oi_end; ++oi) { edge_t e(*oi); vertex_t e_source(source(e,g)); @@ -689,7 +689,7 @@ namespace boost = face_handles[first_tail].first_vertex(); vertex_t second = face_handles[first_tail].second_vertex(); - tie(first_side_vertex, first_tail) + boost::tie(first_side_vertex, first_tail) = make_tuple(first_tail, first == first_side_vertex ? second : first @@ -701,7 +701,7 @@ namespace boost = face_handles[second_tail].first_vertex(); vertex_t second = face_handles[second_tail].second_vertex(); - tie(second_side_vertex, second_tail) + boost::tie(second_side_vertex, second_tail) = make_tuple(second_tail, first == second_side_vertex ? second : first); @@ -790,10 +790,10 @@ namespace boost { bottom_path_follows_first = next_bottom_follows_first; - tie(merge_point, - next_bottom_follows_first, - top_path_follows_first - ) = merge_stack.back(); + boost::tie(merge_point, + next_bottom_follows_first, + top_path_follows_first + ) = merge_stack.back(); merge_stack.pop_back(); face_handle_t top_handle(face_handles[merge_point]); @@ -918,7 +918,7 @@ namespace boost // planar embedding no matter what order we embed them in. vertex_iterator_t xi, xi_end; - for(tie(xi,xi_end) = vertices(g); xi != xi_end; ++xi) + for(boost::tie(xi,xi_end) = vertices(g); xi != xi_end; ++xi) { if (!separated_dfs_child_list[*xi]->empty()) { @@ -1058,10 +1058,10 @@ namespace boost bool seen_goal_edge = false; out_edge_iterator_t oi, oi_end; - for(tie(oi,oi_end) = out_edges(v,g); oi != oi_end; ++oi) + for(boost::tie(oi,oi_end) = out_edges(v,g); oi != oi_end; ++oi) forbidden_edge[*oi] = true; - for(tie(oi,oi_end) = out_edges(v,g); oi != oi_end; ++oi) + for(boost::tie(oi,oi_end) = out_edges(v,g); oi != oi_end; ++oi) { path_edges.clear(); @@ -1195,7 +1195,7 @@ namespace boost // Clear the short-circuit edges - these are needed for the planar // testing/embedding algorithm to run in linear time, but they'll // complicate the kuratowski subgraph isolation - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) { face_handles[*vi].reset_vertex_cache(); dfs_child_handles[*vi].reset_vertex_cache(); @@ -1352,7 +1352,7 @@ namespace boost //Find external path to x and to y - for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { edge_t e(*ei); goal_edge[e] @@ -1376,7 +1376,7 @@ namespace boost } - for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { edge_t e(*ei); goal_edge[e] @@ -1407,13 +1407,13 @@ namespace boost { chosen_case = detail::BM_CASE_A; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) if (lower_face_vertex[*vi]) - for(tie(oei,oei_end) = out_edges(*vi,g); oei != oei_end; ++oei) + for(boost::tie(oei,oei_end) = out_edges(*vi,g); oei != oei_end; ++oei) if(!outer_face_edge[*oei]) goal_edge[*oei] = true; - for(tie(ei,ei_end) = edges(g); ei != ei_end; ++ei) + for(boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei) forbidden_edge[*ei] = outer_face_edge[*ei]; z = kuratowski_walkup @@ -1424,7 +1424,7 @@ namespace boost { chosen_case = detail::BM_CASE_B; - for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { edge_t e(*ei); goal_edge[e] = false; @@ -1442,7 +1442,7 @@ namespace boost ); - for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { forbidden_edge[*ei] = outer_face_edge[*ei]; } @@ -1646,7 +1646,7 @@ namespace boost //First, get a list of all of v's embedded child edges out_edge_iterator_t v_edge_itr, v_edge_end; - for(tie(v_edge_itr,v_edge_end) = out_edges(v,g); + for(boost::tie(v_edge_itr,v_edge_end) = out_edges(v,g); v_edge_itr != v_edge_end; ++v_edge_itr ) { @@ -1711,7 +1711,7 @@ namespace boost //Finding z and w. - for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { edge_t e(*ei); goal_edge[e] = !outer_face_edge[e] && @@ -1729,14 +1729,14 @@ namespace boost if (chosen_case == detail::BM_CASE_E) { - for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { forbidden_edge[*ei] = outer_face_edge[*ei]; goal_edge[*ei] = !outer_face_edge[*ei] && (source(*ei,g) == w || target(*ei,g) == w); } - for(tie(oei, oei_end) = out_edges(w,g); oei != oei_end; ++oei) + for(boost::tie(oei, oei_end) = out_edges(w,g); oei != oei_end; ++oei) { if (!outer_face_edge[*oei]) goal_edge[*oei] = true; @@ -1800,7 +1800,7 @@ namespace boost while(child != parent) { is_in_subgraph[dfs_parent_edge[child]] = true; - tie(parent, child) = std::make_pair( dfs_parent[parent], parent ); + boost::tie(parent, child) = std::make_pair( dfs_parent[parent], parent ); } @@ -1928,7 +1928,7 @@ namespace boost } - for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) if (is_in_subgraph[*ei]) *o_itr = *ei; @@ -1940,7 +1940,7 @@ namespace boost void make_edge_permutation(EdgePermutation perm) { vertex_iterator_t vi, vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) { vertex_t v(*vi); perm[v].clear(); diff --git a/include/boost/graph/profile.hpp b/include/boost/graph/profile.hpp old mode 100755 new mode 100644 index 1ba2d249..1ff99de5 --- a/include/boost/graph/profile.hpp +++ b/include/boost/graph/profile.hpp @@ -23,7 +23,7 @@ namespace boost { { typename graph_traits::vertices_size_type b = 0; typename graph_traits::vertex_iterator i, end; - for (tie(i, end) = vertices(g); i != end; ++i){ + for (boost::tie(i, end) = vertices(g); i != end; ++i){ b += ith_bandwidth(*i, g, index) + 1; } diff --git a/include/boost/graph/push_relabel_max_flow.hpp b/include/boost/graph/push_relabel_max_flow.hpp index 17fc26f6..fdea7a7e 100644 --- a/include/boost/graph/push_relabel_max_flow.hpp +++ b/include/boost/graph/push_relabel_max_flow.hpp @@ -146,12 +146,12 @@ namespace boost { // Initialize flow to zero which means initializing // the residual capacity to equal the capacity. out_edge_iterator ei, e_end; - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) - for (tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) { + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) + for (boost::tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) { put(residual_capacity, *ei, get(capacity, *ei)); } - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { vertex_descriptor u = *u_iter; put(excess_flow, u, 0); current[u] = out_edges(u, g); @@ -161,7 +161,7 @@ namespace boost { FlowValue test_excess = 0; out_edge_iterator a_iter, a_end; - for (tie(a_iter, a_end) = out_edges(src, g); a_iter != a_end; ++a_iter) + for (boost::tie(a_iter, a_end) = out_edges(src, g); a_iter != a_end; ++a_iter) if (target(*a_iter, g) != src) test_excess += get(residual_capacity, *a_iter); if (test_excess > (std::numeric_limits::max)()) @@ -171,7 +171,7 @@ namespace boost { put(excess_flow, src, (std::numeric_limits::max)()); else { put(excess_flow, src, 0); - for (tie(a_iter, a_end) = out_edges(src, g); + for (boost::tie(a_iter, a_end) = out_edges(src, g); a_iter != a_end; ++a_iter) { edge_descriptor a = *a_iter; vertex_descriptor tgt = target(a, g); @@ -189,7 +189,7 @@ namespace boost { max_active = 0; min_active = n; - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { vertex_descriptor u = *u_iter; if (u == sink) { put(distance, u, 0); @@ -218,7 +218,7 @@ namespace boost { BOOST_USING_STD_MAX(); ++update_count; vertex_iterator u_iter, u_end; - for (tie(u_iter,u_end) = vertices(g); u_iter != u_end; ++u_iter) { + for (boost::tie(u_iter,u_end) = vertices(g); u_iter != u_end; ++u_iter) { put(color, *u_iter, ColorTraits::white()); put(distance, *u_iter, n); } @@ -240,7 +240,7 @@ namespace boost { distance_size_type d_v = get(distance, u) + 1; out_edge_iterator ai, a_end; - for (tie(ai, a_end) = out_edges(u, g); ai != a_end; ++ai) { + for (boost::tie(ai, a_end) = out_edges(u, g); ai != a_end; ++ai) { edge_descriptor a = *ai; vertex_descriptor v = target(a, g); if (get(color, v) == ColorTraits::white() @@ -269,7 +269,7 @@ namespace boost { assert(get(excess_flow, u) > 0); while (1) { out_edge_iterator ai, ai_end; - for (tie(ai, ai_end) = current[u]; ai != ai_end; ++ai) { + for (boost::tie(ai, ai_end) = current[u]; ai != ai_end; ++ai) { edge_descriptor a = *ai; if (is_residual_edge(a)) { vertex_descriptor v = target(a, g); @@ -345,7 +345,7 @@ namespace boost { // Examine the residual out-edges of vertex i, choosing the // edge whose target vertex has the minimal distance. out_edge_iterator ai, a_end, min_edge_iter; - for (tie(ai, a_end) = out_edges(u, g); ai != a_end; ++ai) { + for (boost::tie(ai, a_end) = out_edges(u, g); ai != a_end; ++ai) { ++work_since_last_update; edge_descriptor a = *ai; vertex_descriptor v = target(a, g); @@ -441,20 +441,20 @@ namespace boost { bool bos_null = true; // handle self-loops - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) - for (tie(ai, a_end) = out_edges(*u_iter, g); ai != a_end; ++ai) + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) + for (boost::tie(ai, a_end) = out_edges(*u_iter, g); ai != a_end; ++ai) if (target(*ai, g) == *u_iter) put(residual_capacity, *ai, get(capacity, *ai)); // initialize - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { u = *u_iter; put(color, u, ColorTraits::white()); parent[u] = u; current[u] = out_edges(u, g); } // eliminate flow cycles and topologically order the vertices - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { u = *u_iter; if (get(color, u) == ColorTraits::white() && get(excess_flow, u) > 0 @@ -541,7 +541,7 @@ namespace boost { // note that the sink is not on the stack if (! bos_null) { for (u = tos; u != bos; u = topo_next[u]) { - tie(ai, a_end) = out_edges(u, g); + boost::tie(ai, a_end) = out_edges(u, g); while (get(excess_flow, u) > 0 && ai != a_end) { if (get(capacity, *ai) == 0 && is_residual_edge(*ai)) push_flow(*ai); @@ -567,8 +567,8 @@ namespace boost { out_edge_iterator ai, a_end; // check edge flow values - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { - for (tie(ai, a_end) = out_edges(*u_iter, g); ai != a_end; ++ai) { + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { + for (boost::tie(ai, a_end) = out_edges(*u_iter, g); ai != a_end; ++ai) { edge_descriptor a = *ai; if (get(capacity, a) > 0) if ((get(residual_capacity, a) + get(residual_capacity, get(reverse_edge, a)) @@ -581,13 +581,13 @@ namespace boost { // check conservation FlowValue sum; - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) { vertex_descriptor u = *u_iter; if (u != src && u != sink) { if (get(excess_flow, u) != 0) return false; sum = 0; - for (tie(ai, a_end) = out_edges(u, g); ai != a_end; ++ai) + for (boost::tie(ai, a_end) = out_edges(u, g); ai != a_end; ++ai) if (get(capacity, *ai) > 0) sum -= get(capacity, *ai) - get(residual_capacity, *ai); else @@ -620,8 +620,8 @@ namespace boost { os << "flow values" << std::endl; vertex_iterator u_iter, u_end; out_edge_iterator ei, e_end; - for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) - for (tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) + for (boost::tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter) + for (boost::tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei) if (get(capacity, *ei) > 0) os << *u_iter << " " << target(*ei, g) << " " << (get(capacity, *ei) - get(residual_capacity, *ei)) << std::endl; diff --git a/include/boost/graph/r_c_shortest_paths.hpp b/include/boost/graph/r_c_shortest_paths.hpp index b1bd7574..37bf3f34 100644 --- a/include/boost/graph/r_c_shortest_paths.hpp +++ b/include/boost/graph/r_c_shortest_paths.hpp @@ -359,7 +359,7 @@ void r_c_shortest_paths_dispatch typename graph_traits::vertex_descriptor cur_vertex = cur_label->resident_vertex; typename graph_traits::out_edge_iterator oei, oei_end; - for( tie( oei, oei_end ) = out_edges( cur_vertex, g ); + for( boost::tie( oei, oei_end ) = out_edges( cur_vertex, g ); oei != oei_end; ++oei ) { diff --git a/include/boost/graph/random.hpp b/include/boost/graph/random.hpp index bc53b8f3..2c2f4810 100644 --- a/include/boost/graph/random.hpp +++ b/include/boost/graph/random.hpp @@ -157,7 +157,7 @@ namespace boost { b = random_vertex(g, gen); } while (self_edges == false && a == b); edge_t e; bool inserted; - tie(e, inserted) = add_edge(a, b, g); + boost::tie(e, inserted) = add_edge(a, b, g); if (inserted) *edge_out++ = std::make_pair(source(e, g), target(e, g)); } @@ -171,7 +171,7 @@ namespace boost { { typename property_map::type pm = get(Property(), g); typename graph_traits::vertex_iterator vi, ve; - for (tie(vi, ve) = vertices(g); vi != ve; ++vi) { + for (boost::tie(vi, ve) = vertices(g); vi != ve; ++vi) { pm[*vi] = rg(); } } @@ -182,7 +182,7 @@ namespace boost { { typename property_map::type pm = get(Property(), g); typename graph_traits::edge_iterator ei, ee; - for (tie(ei, ee) = edges(g); ei != ee; ++ei) { + for (boost::tie(ei, ee) = edges(g); ei != ee; ++ei) { pm[*ei] = rg(); } } diff --git a/include/boost/graph/read_dimacs.hpp b/include/boost/graph/read_dimacs.hpp index b433ec0a..0fedbfae 100644 --- a/include/boost/graph/read_dimacs.hpp +++ b/include/boost/graph/read_dimacs.hpp @@ -231,8 +231,8 @@ int read_dimacs_max_flow(Graph& g, { edge_descriptor e1, e2; bool in1, in2; - tie(e1, in1) = add_edge(verts[tail], verts[head], g); - tie(e2, in2) = add_edge(verts[head], verts[tail], g); + boost::tie(e1, in1) = add_edge(verts[tail], verts[head], g); + boost::tie(e2, in2) = add_edge(verts[head], verts[tail], g); if (!in1 || !in2) { std::cerr << "unable to add edge (" << head << "," << tail << ")" << std::endl; diff --git a/include/boost/graph/reverse_graph.hpp b/include/boost/graph/reverse_graph.hpp index 3a81c294..5669bb9b 100644 --- a/include/boost/graph/reverse_graph.hpp +++ b/include/boost/graph/reverse_graph.hpp @@ -220,7 +220,7 @@ adjacent_vertices(typename graph_traits::vertex_descriptor u { typedef reverse_graph Graph; typename graph_traits::out_edge_iterator first, last; - tie(first, last) = out_edges(u, g); + boost::tie(first, last) = out_edges(u, g); typedef typename graph_traits::adjacency_iterator adjacency_iterator; return std::make_pair(adjacency_iterator(first, const_cast(&g)), adjacency_iterator(last, const_cast(&g))); diff --git a/include/boost/graph/rmat_graph_generator.hpp b/include/boost/graph/rmat_graph_generator.hpp index 24048226..7060673c 100644 --- a/include/boost/graph/rmat_graph_generator.hpp +++ b/include/boost/graph/rmat_graph_generator.hpp @@ -164,7 +164,7 @@ namespace boost { // Generate the first edge vertices_size_type u, v; - tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d); + boost::tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d); if (permute_vertices) current = std::make_pair(vertexPermutation[u], @@ -181,7 +181,7 @@ namespace boost { rmat_iterator& operator++() { vertices_size_type u, v; - tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d); + boost::tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d); if (permute_vertices) current = std::make_pair(vertexPermutation[u], @@ -279,7 +279,7 @@ namespace boost { for (edges_size_type i = 0; i < m; ++i) { vertices_size_type u, v; - tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d); + boost::tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d); if (permute_vertices) { if (ep(vertexPermutation[u], vertexPermutation[v])) @@ -381,7 +381,7 @@ namespace boost { edges_size_type edges = 0; do { vertices_size_type u, v; - tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d); + boost::tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d); // Lowest vertex number always comes first // (this means we don't have to worry about i->j and j->i being in the edge list) @@ -495,7 +495,7 @@ namespace boost { do { vertices_size_type u, v; - tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d); + boost::tie(u, v) = generate_edge(this->gen, n, SCALE, a, b, c, d); if (bidirectional) { if (edge_map.find(std::make_pair(u, v)) == edge_map.end()) { diff --git a/include/boost/graph/sequential_vertex_coloring.hpp b/include/boost/graph/sequential_vertex_coloring.hpp index f5362b3c..6bca0843 100644 --- a/include/boost/graph/sequential_vertex_coloring.hpp +++ b/include/boost/graph/sequential_vertex_coloring.hpp @@ -61,7 +61,7 @@ namespace boost { //Initialize colors typename GraphTraits::vertex_iterator v, vend; - for (tie(v, vend) = vertices(G); v != vend; ++v) + for (boost::tie(v, vend) = vertices(G); v != vend; ++v) put(color, *v, V-1); //Determine the color for every vertex one by one @@ -71,7 +71,7 @@ namespace boost { //Mark the colors of vertices adjacent to current. //i can be the value for marking since i increases successively - for (tie(v,vend) = adjacent_vertices(current, G); v != vend; ++v) + for (boost::tie(v,vend) = adjacent_vertices(current, G); v != vend; ++v) mark[get(color,*v)] = i; //Next step is to assign the smallest un-marked color diff --git a/include/boost/graph/sloan_ordering.hpp b/include/boost/graph/sloan_ordering.hpp index ff5748dd..781e9c9f 100644 --- a/include/boost/graph/sloan_ordering.hpp +++ b/include/boost/graph/sloan_ordering.hpp @@ -139,7 +139,7 @@ namespace boost { //step 1 //Scan for the vertex with the smallest degree and the maximum degree typename graph_traits::vertex_iterator ui, ui_end; - for (tie(ui, ui_end) = vertices(G); ui != ui_end; ++ui) + for (boost::tie(ui, ui_end) = vertices(G); ui != ui_end; ++ui) { dummy = get(degree, *ui); @@ -180,7 +180,7 @@ namespace boost { //step 4 //pushing one node of each degree in an ascending manner into degree_queue std::vector shrink_trace(maximum_degree, false); - for (tie(ui, ui_end) = vertices(G); ui != ui_end; ++ui) + for (boost::tie(ui, ui_end) = vertices(G); ui != ui_end; ++ui) { dummy = get(degree, *ui); @@ -292,7 +292,7 @@ namespace boost { //Sets the color and priority to their initial status unsigned cdeg; typename graph_traits::vertex_iterator ui, ui_end; - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { put(color, *ui, Color::white()); cdeg=get(degree, *ui)+1; @@ -321,7 +321,7 @@ namespace boost { if(get(color, u) == Color::green() ) { //for-loop over all out-edges of vertex u - for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { v = target(*ei, g); @@ -340,7 +340,7 @@ namespace boost { put(color, u, Color::black() ); //Gives u an inactive status //for loop over all the adjacent vertices of u - for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { v = target(*ei, g); @@ -350,7 +350,7 @@ namespace boost { put(priority, v, get(priority, v)+W2); //updates the priority //for loop over alll adjacent vertices of v - for (tie(ei2, ei2_end) = out_edges(v, g); ei2 != ei2_end; ++ei2) { + for (boost::tie(ei2, ei2_end) = out_edges(v, g); ei2 != ei2_end; ++ei2) { w = target(*ei2, g); if(get(color, w) != Color::black() ) { //tests if vertex is postactive diff --git a/include/boost/graph/strong_components.hpp b/include/boost/graph/strong_components.hpp index 9469010a..6494283e 100644 --- a/include/boost/graph/strong_components.hpp +++ b/include/boost/graph/strong_components.hpp @@ -54,7 +54,7 @@ namespace boost { const Graph& g) { typename graph_traits::vertex_descriptor w; typename graph_traits::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(v, g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(v, g); ei != ei_end; ++ei) { w = target(*ei, g); if (get(comp, w) == (std::numeric_limits::max)()) put(root, v, this->min_discover_time(get(root,v), get(root,w))); @@ -249,7 +249,7 @@ namespace boost { { components.resize(num_scc); typename graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) components[component_number[*vi]].push_back(*vi); } @@ -304,7 +304,7 @@ namespace boost { // initialize G_T typename graph_traits::vertex_iterator ui, ui_end; - for (tie(ui, ui_end) = vertices(G_T); ui != ui_end; ++ui) + for (boost::tie(ui, ui_end) = vertices(G_T); ui != ui_end; ++ui) put(color, *ui, Color::white()); typedef typename property_traits::value_type D; @@ -314,8 +314,8 @@ namespace boost { std::priority_queue, Compare > Q(fl); typename graph_traits::vertex_iterator i, j, iend, jend; - tie(i, iend) = vertices(G_T); - tie(j, jend) = vertices(G); + boost::tie(i, iend) = vertices(G_T); + boost::tie(j, jend) = vertices(G); for ( ; i != iend; ++i, ++j) { put(finish_time, *i, get(finish_time, *j)); Q.push(*i); diff --git a/include/boost/graph/subgraph.hpp b/include/boost/graph/subgraph.hpp index 15cdace5..093da7b0 100644 --- a/include/boost/graph/subgraph.hpp +++ b/include/boost/graph/subgraph.hpp @@ -124,7 +124,7 @@ typedef typename Traits::traversal_category traversal_category; { typename Graph::vertex_iterator v, v_end; vertices_size_type i = 0; - for(tie(v, v_end) = vertices(m_graph); v != v_end; ++v) + for(boost::tie(v, v_end) = vertices(m_graph); v != v_end; ++v) m_global_vertex[i++] = *v; } @@ -180,7 +180,7 @@ typedef typename Traits::traversal_category traversal_category; vertex_descriptor global_to_local(vertex_descriptor u_global) const { vertex_descriptor u_local; bool in_subgraph; if (is_root()) return u_global; - tie(u_local, in_subgraph) = this->find_vertex(u_global); + boost::tie(u_local, in_subgraph) = this->find_vertex(u_global); assert(in_subgraph == true); return u_local; } @@ -315,7 +315,7 @@ public: // Probably shouldn't be public.... { edge_descriptor e_local; bool inserted; - tie(e_local, inserted) = add_edge(u_local, v_local, m_graph); + boost::tie(e_local, inserted) = add_edge(u_local, v_local, m_graph); put(edge_index, m_graph, e_local, m_edge_counter++); m_global_edge.push_back(e_global); m_local_edge[get(get(edge_index, this->root()), e_global)] = e_local; @@ -358,7 +358,7 @@ add_vertex(typename subgraph::vertex_descriptor u_global, // remember edge global and local maps { typename subgraph::out_edge_iterator ei, ei_end; - for (tie(ei, ei_end) = out_edges(u_global, r); + for (boost::tie(ei, ei_end) = out_edges(u_global, r); ei != ei_end; ++ei) { e_global = *ei; v_global = target(e_global, r); @@ -369,10 +369,10 @@ add_vertex(typename subgraph::vertex_descriptor u_global, if (is_directed(g)) { // not necessary for undirected graph typename subgraph::vertex_iterator vi, vi_end; typename subgraph::out_edge_iterator ei, ei_end; - for(tie(vi, vi_end) = vertices(r); vi != vi_end; ++vi) { + for(boost::tie(vi, vi_end) = vertices(r); vi != vi_end; ++vi) { v_global = *vi; if(g.find_vertex(v_global).second) - for(tie(ei, ei_end) = out_edges(*vi, r); ei != ei_end; ++ei) { + for(boost::tie(ei, ei_end) = out_edges(*vi, r); ei != ei_end; ++ei) { e_global = *ei; uu_global = target(e_global, r); if(uu_global == u_global && g.find_vertex(v_global).second) { @@ -507,8 +507,8 @@ namespace detail { // add local edge only if u_global and v_global are in subgraph g Vertex u_local, v_local; bool u_in_subgraph, v_in_subgraph; - tie(u_local, u_in_subgraph) = g.find_vertex(u_global); - tie(v_local, v_in_subgraph) = g.find_vertex(v_global); + boost::tie(u_local, u_in_subgraph) = g.find_vertex(u_global); + boost::tie(v_local, v_in_subgraph) = g.find_vertex(v_global); if(u_in_subgraph && v_in_subgraph) { g.local_add_edge(u_local, v_local, e_global); } @@ -525,7 +525,7 @@ namespace detail { if(g.is_root()) { typename subgraph::edge_descriptor e_global; bool inserted; - tie(e_global, inserted) = add_edge(u_global, v_global, ep, g.m_graph); + boost::tie(e_global, inserted) = add_edge(u_global, v_global, ep, g.m_graph); put(edge_index, g.m_graph, e_global, g.m_edge_counter++); g.m_global_edge.push_back(e_global); children_add_edge(u_global, v_global, e_global, g.m_children, orig); @@ -554,7 +554,7 @@ add_edge(typename subgraph::vertex_descriptor u, } else { typename subgraph::edge_descriptor e_local, e_global; bool inserted; - tie(e_global, inserted) = + boost::tie(e_global, inserted) = detail::add_edge_recur_up(g.local_to_global(u), g.local_to_global(v), ep, g, &g); diff --git a/include/boost/graph/transitive_closure.hpp b/include/boost/graph/transitive_closure.hpp index 378dacf5..01bfb3d3 100644 --- a/include/boost/graph/transitive_closure.hpp +++ b/include/boost/graph/transitive_closure.hpp @@ -101,7 +101,7 @@ namespace boost for (size_type i = 0; i < components[s].size(); ++i) { vertex u = components[s][i]; adjacency_iterator v, v_end; - for (tie(v, v_end) = adjacent_vertices(u, g); v != v_end; ++v) { + for (boost::tie(v, v_end) = adjacent_vertices(u, g); v != v_end; ++v) { cg_vertex t = component_number[*v]; if (s != t) // Avoid loops in the condensation graph adj.push_back(t); @@ -144,7 +144,7 @@ namespace boost chain.push_back(v); in_a_chain[v] = true; typename graph_traits::adjacency_iterator adj_first, adj_last; - tie(adj_first, adj_last) = adjacent_vertices(v, CG); + boost::tie(adj_first, adj_last) = adjacent_vertices(v, CG); typename graph_traits::adjacency_iterator next = std::find_if(adj_first, adj_last, std::not1(detail::subscript(in_a_chain))); @@ -174,7 +174,7 @@ namespace boost i = topo_order.rbegin(); i != topo_order.rend(); ++i) { cg_vertex u = *i; typename graph_traits::adjacency_iterator adj, adj_last; - for (tie(adj, adj_last) = adjacent_vertices(u, CG); + for (boost::tie(adj, adj_last) = adjacent_vertices(u, CG); adj != adj_last; ++adj) { cg_vertex v = *adj; if (topo_number[v] < successors[u][chain_number[v]]) { @@ -204,15 +204,15 @@ namespace boost typedef typename graph_traits < GraphTC >::vertex_descriptor tc_vertex; { vertex_iterator i, i_end; - for (tie(i, i_end) = vertices(g); i != i_end; ++i) + for (boost::tie(i, i_end) = vertices(g); i != i_end; ++i) g_to_tc_map[*i] = add_vertex(tc); } // Add edges between all the vertices in two adjacent SCCs typename graph_traits::vertex_iterator si, si_end; - for (tie(si, si_end) = vertices(CG); si != si_end; ++si) { + for (boost::tie(si, si_end) = vertices(CG); si != si_end; ++si) { cg_vertex s = *si; typename graph_traits::adjacency_iterator i, i_end; - for (tie(i, i_end) = adjacent_vertices(s, CG); i != i_end; ++i) { + for (boost::tie(i, i_end) = adjacent_vertices(s, CG); i != i_end; ++i) { cg_vertex t = *i; for (size_type k = 0; k < components[s].size(); ++k) for (size_type l = 0; l < components[t].size(); ++l) @@ -233,7 +233,7 @@ namespace boost // Need to add it to transitive closure. { vertex_iterator i, i_end; - for (tie(i, i_end) = vertices(g); i != i_end; ++i) + for (boost::tie(i, i_end) = vertices(g); i != i_end; ++i) { adjacency_iterator ab, ae; for (boost::tie(ab, ae) = adjacent_vertices(*i, g); ab != ae; ++ab) @@ -312,10 +312,10 @@ namespace boost // for j // A[i,j] = A[i,j] | A[k,j] vertex_iterator ki, ke, ii, ie, ji, je; - for (tie(ki, ke) = vertices(g); ki != ke; ++ki) - for (tie(ii, ie) = vertices(g); ii != ie; ++ii) + for (boost::tie(ki, ke) = vertices(g); ki != ke; ++ki) + for (boost::tie(ii, ie) = vertices(g); ii != ie; ++ii) if (edge(*ii, *ki, g).second) - for (tie(ji, je) = vertices(g); ji != je; ++ji) + for (boost::tie(ji, je) = vertices(g); ji != je; ++ji) if (!edge(*ii, *ji, g).second && edge(*ki, *ji, g).second) { add_edge(*ii, *ji, g); } @@ -342,10 +342,10 @@ namespace boost // A[i,j] = A[i,j] | A[k,j] vertex_iterator ic, ie, jc, je, kc, ke; - for (tie(ic, ie) = vertices(g), ++ic; ic != ie; ++ic) - for (tie(kc, ke) = vertices(g); *kc != *ic; ++kc) + for (boost::tie(ic, ie) = vertices(g), ++ic; ic != ie; ++ic) + for (boost::tie(kc, ke) = vertices(g); *kc != *ic; ++kc) if (edge(*ic, *kc, g).second) - for (tie(jc, je) = vertices(g); jc != je; ++jc) + for (boost::tie(jc, je) = vertices(g); jc != je; ++jc) if (!edge(*ic, *jc, g).second && edge(*kc, *jc, g).second) { add_edge(*ic, *jc, g); } @@ -355,10 +355,10 @@ namespace boost // for j = 1 to n // A[i,j] = A[i,j] | A[k,j] - for (tie(ic, ie) = vertices(g), --ie; ic != ie; ++ic) + for (boost::tie(ic, ie) = vertices(g), --ie; ic != ie; ++ic) for (kc = ic, ke = ie, ++kc; kc != ke; ++kc) if (edge(*ic, *kc, g).second) - for (tie(jc, je) = vertices(g); jc != je; ++jc) + for (boost::tie(jc, je) = vertices(g); jc != je; ++jc) if (!edge(*ic, *jc, g).second && edge(*kc, *jc, g).second) { add_edge(*ic, *jc, g); } diff --git a/include/boost/graph/transitive_reduction.hpp b/include/boost/graph/transitive_reduction.hpp index 5cfa9627..44dfee98 100644 --- a/include/boost/graph/transitive_reduction.hpp +++ b/include/boost/graph/transitive_reduction.hpp @@ -91,7 +91,7 @@ transitive_reduction(const Graph& g, GraphTR& tr, //do that. So what I'm doint is, collection the successors of *it here { typename Graph::out_edge_iterator oi,oi_end; - for( tie(oi, oi_end) = out_edges( *it, g ); oi != oi_end; ++oi ) { + for( boost::tie(oi, oi_end) = out_edges( *it, g ); oi != oi_end; ++oi ) { neighbors.push_back( target( *oi, g ) ); } } diff --git a/include/boost/graph/tree_traits.hpp b/include/boost/graph/tree_traits.hpp index a9f7e8ce..0843628c 100644 --- a/include/boost/graph/tree_traits.hpp +++ b/include/boost/graph/tree_traits.hpp @@ -21,7 +21,7 @@ namespace boost { { visitor.preorder(v, t); typename tree_traits::children_iterator i, end; - tie(i, end) = children(v, t); + boost::tie(i, end) = children(v, t); if (i != end) { traverse_tree(*i++, t, visitor); visitor.inorder(v, t); diff --git a/include/boost/graph/undirected_dfs.hpp b/include/boost/graph/undirected_dfs.hpp index 2486cd4b..9cad25ad 100644 --- a/include/boost/graph/undirected_dfs.hpp +++ b/include/boost/graph/undirected_dfs.hpp @@ -56,7 +56,7 @@ namespace boost { VertexInfo& back = stack.back(); u = back.first; Iter ei, ei_end; - tie(ei, ei_end) = back.second; + boost::tie(ei, ei_end) = back.second; stack.pop_back(); while (ei != ei_end) { Vertex v = target(*ei, g); @@ -70,7 +70,7 @@ namespace boost { u = v; put(vertex_color, u, Color::gray()); vis.discover_vertex(u, g); - tie(ei, ei_end) = out_edges(u, g); + boost::tie(ei, ei_end) = out_edges(u, g); } else if (v_color == Color::gray()) { if (uv_color == EColor::white()) vis.back_edge(*ei, g); ++ei; @@ -109,7 +109,7 @@ namespace boost { typename graph_traits::out_edge_iterator ei, ei_end; put(vertex_color, u, Color::gray()); vis.discover_vertex(u, g); - for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) { Vertex v = target(*ei, g); vis.examine_edge(*ei, g); ColorValue v_color = get(vertex_color, v); EColorValue uv_color = get(edge_color, *ei); @@ -141,18 +141,18 @@ namespace boost { typedef color_traits Color; typename graph_traits::vertex_iterator ui, ui_end; - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { put(vertex_color, *ui, Color::white()); vis.initialize_vertex(*ui, g); } typename graph_traits::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) put(edge_color, *ei, Color::white()); if (start_vertex != *vertices(g).first){ vis.start_vertex(start_vertex, g); detail::undir_dfv_impl(g, start_vertex, vis, vertex_color, edge_color); } - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { ColorValue u_color = get(vertex_color, *ui); if (u_color == Color::white()) { vis.start_vertex(*ui, g); detail::undir_dfv_impl(g, *ui, vis, vertex_color, edge_color); diff --git a/include/boost/graph/undirected_graph.hpp b/include/boost/graph/undirected_graph.hpp index 5e661b96..6dee3cc5 100644 --- a/include/boost/graph/undirected_graph.hpp +++ b/include/boost/graph/undirected_graph.hpp @@ -199,7 +199,7 @@ public: // find all edges, (u, v) std::vector edges; out_edge_iterator i, i_end; - for(tie(i, i_end) = boost::out_edges(u, m_graph); i != i_end; ++i) { + for(boost::tie(i, i_end) = boost::out_edges(u, m_graph); i != i_end; ++i) { if(boost::target(*i, m_graph) == v) { edges.push_back(*i); } @@ -226,7 +226,7 @@ public: void renumber_vertex_indices() { vertex_iterator i, i_end; - tie(i, i_end) = vertices(m_graph); + boost::tie(i, i_end) = vertices(m_graph); m_max_vertex_index = renumber_vertex_indices(i, i_end, 0); } @@ -245,7 +245,7 @@ public: void renumber_edge_indices() { edge_iterator i, end; - tie(i, end) = edges(m_graph); + boost::tie(i, end) = edges(m_graph); m_max_edge_index = renumber_edge_indices(i, end, 0); } diff --git a/include/boost/graph/wavefront.hpp b/include/boost/graph/wavefront.hpp index 00cf3524..4d9c909c 100644 --- a/include/boost/graph/wavefront.hpp +++ b/include/boost/graph/wavefront.hpp @@ -37,12 +37,12 @@ namespace boost { rows_active[index_i] = true; typename graph_traits::vertex_iterator ui, ui_end; - for (tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) + for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui) { v = *ui; if(index[v] <= index_i) { - for (tie(edge_it2, edge_it2_end) = out_edges(v, g); edge_it2 != edge_it2_end; ++edge_it2) + for (boost::tie(edge_it2, edge_it2_end) = out_edges(v, g); edge_it2 != edge_it2_end; ++edge_it2) { w = target(*edge_it2, g); if( (index[w] >= index_i) && (!rows_active[index[w]]) ) @@ -74,7 +74,7 @@ namespace boost { BOOST_USING_STD_MAX(); typename graph_traits::vertices_size_type b = 0; typename graph_traits::vertex_iterator i, end; - for (tie(i, end) = vertices(g); i != end; ++i) + for (boost::tie(i, end) = vertices(g); i != end; ++i) b = max BOOST_PREVENT_MACRO_SUBSTITUTION(b, ith_wavefront(*i, g, index)); return b; } @@ -93,7 +93,7 @@ namespace boost { { double b = 0; typename graph_traits::vertex_iterator i, end; - for (tie(i, end) = vertices(g); i != end; ++i) + for (boost::tie(i, end) = vertices(g); i != end; ++i) b += ith_wavefront(*i, g, index); b /= num_vertices(g); @@ -114,7 +114,7 @@ namespace boost { { double b = 0; typename graph_traits::vertex_iterator i, end; - for (tie(i, end) = vertices(g); i != end; ++i) + for (boost::tie(i, end) = vertices(g); i != end; ++i) b += std::pow(double ( ith_wavefront(*i, g, index) ), 2.0); b /= num_vertices(g); diff --git a/src/graphml.cpp b/src/graphml.cpp index 4f9677df..87cab74c 100644 --- a/src/graphml.cpp +++ b/src/graphml.cpp @@ -168,7 +168,7 @@ private: any edge; bool added; - tie(edge, added) = m_g.do_add_edge(source, target); + boost::tie(edge, added) = m_g.do_add_edge(source, target); if (!added) { BOOST_THROW_EXCEPTION(bad_parallel_edge(u, v)); } diff --git a/test/astar_search_test.cpp b/test/astar_search_test.cpp index ae86ab76..36fb0a47 100644 --- a/test/astar_search_test.cpp +++ b/test/astar_search_test.cpp @@ -162,8 +162,8 @@ int main(int, char **) WeightMap weightmap = get(edge_weight, g); for(std::size_t j = 0; j < num_edges; ++j) { edge_descriptor e; bool inserted; - tie(e, inserted) = add_edge(edge_array[j].first, - edge_array[j].second, g); + boost::tie(e, inserted) = add_edge(edge_array[j].first, + edge_array[j].second, g); weightmap[e] = weights[j]; } diff --git a/test/betweenness_centrality_test.cpp b/test/betweenness_centrality_test.cpp index f35c16ba..585e97de 100644 --- a/test/betweenness_centrality_test.cpp +++ b/test/betweenness_centrality_test.cpp @@ -45,7 +45,7 @@ run_weighted_test(Graph*, int V, weighted_edge edge_init[], int E, { vertex_iterator v, v_end; int index = 0; - for (tie(v, v_end) = boost::vertices(g); v != v_end; ++v, ++index) { + for (boost::tie(v, v_end) = boost::vertices(g); v != v_end; ++v, ++index) { put(vertex_index, g, *v, index); vertices[index] = *v; } @@ -93,7 +93,7 @@ run_unweighted_test(Graph*, int V, unweighted_edge edge_init[], int E, { vertex_iterator v, v_end; int index = 0; - for (tie(v, v_end) = boost::vertices(g); v != v_end; ++v, ++index) { + for (boost::tie(v, v_end) = boost::vertices(g); v != v_end; ++v, ++index) { put(vertex_index, g, *v, index); vertices[index] = *v; } @@ -186,7 +186,7 @@ run_wheel_test(Graph*, int V) { vertex_iterator v, v_end; int index = 0; - for (tie(v, v_end) = boost::vertices(g); v != v_end; ++v, ++index) { + for (boost::tie(v, v_end) = boost::vertices(g); v != v_end; ++v, ++index) { put(vertex_index, g, *v, index); vertices[index] = *v; if (*v != center) { @@ -247,7 +247,7 @@ void randomly_add_edges(MutableGraph& g, double edge_probability) typedef typename graph_traits::vertex_descriptor vertex; typename graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { vertex v = *vi; typename graph_traits::vertex_iterator wi = is_undirected? vi : vertices(g).first; @@ -273,11 +273,11 @@ simple_unweighted_betweenness_centrality(const Graph& g, VertexIndexMap index, typedef typename boost::property_traits::value_type centrality_type; vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) put(centrality, *vi, 0); vertex_iterator si, si_end; - for (tie(si, si_end) = vertices(g); si != si_end; ++si) { + for (boost::tie(si, si_end) = vertices(g); si != si_end; ++si) { vertex s = *si; // S <-- empty stack @@ -313,7 +313,7 @@ simple_unweighted_betweenness_centrality(const Graph& g, VertexIndexMap index, S.push(v); adjacency_iterator wi, wi_end; - for (tie(wi, wi_end) = adjacent_vertices(v, g); wi != wi_end; ++wi) { + for (boost::tie(wi, wi_end) = adjacent_vertices(v, g); wi != wi_end; ++wi) { vertex w = *wi; // w found for the first time? @@ -366,7 +366,7 @@ simple_unweighted_betweenness_centrality(const Graph& g, VertexIndexMap index, is_same::value; if (is_undirected) { vertex_iterator v, v_end; - for(tie(v, v_end) = vertices(g); v != v_end; ++v) { + for(boost::tie(v, v_end) = vertices(g); v != v_end; ++v) { put(centrality, *v, get(centrality, *v) / centrality_type(2)); } } @@ -380,7 +380,7 @@ void random_unweighted_test(Graph*, int n) { typename graph_traits::vertex_iterator v, v_end; int index = 0; - for (tie(v, v_end) = boost::vertices(g); v != v_end; ++v, ++index) { + for (boost::tie(v, v_end) = boost::vertices(g); v != v_end; ++v, ++index) { put(vertex_index, g, *v, index); } } diff --git a/test/biconnected_components_test.cpp b/test/biconnected_components_test.cpp index d2a801e3..ee37375f 100644 --- a/test/biconnected_components_test.cpp +++ b/test/biconnected_components_test.cpp @@ -42,7 +42,7 @@ check_articulation_points(const Graph& g, std::vector art_points) std::vector art_points_check; typename graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { Graph g_copy(g); Vertex victim = vertex(get(vertex_index, g, *vi), g_copy); clear_vertex(victim, g_copy); @@ -121,7 +121,7 @@ int test_main(int argc, char* argv[]) } graph_traits::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) out << source(*ei, g) << " -- " << target(*ei, g) << "[label=\"" << g[*ei].component << "\"]\n"; out << "}\n"; diff --git a/test/bidir_remove_edge.cpp b/test/bidir_remove_edge.cpp index f1896e1a..ebd48b75 100644 --- a/test/bidir_remove_edge.cpp +++ b/test/bidir_remove_edge.cpp @@ -24,7 +24,7 @@ main(int, char*[]) edge_prop p = { 42 }; edge e; bool b; - tie(e, b) = add_edge(0, 1, p, g); + boost::tie(e, b) = add_edge(0, 1, p, g); BOOST_TEST( num_edges(g) == 1 ); BOOST_TEST( g[e].weight == 42 ); remove_edge(e, g); @@ -37,7 +37,7 @@ main(int, char*[]) graph g(2); edge e; bool b; - tie(e, b) = add_edge(0, 1, g); + boost::tie(e, b) = add_edge(0, 1, g); BOOST_TEST( num_edges(g) == 1 ); remove_edge(e, g); BOOST_TEST( num_edges(g) == 0 ); diff --git a/test/bidir_vec_remove_edge.cpp b/test/bidir_vec_remove_edge.cpp index 4f988153..732eae70 100644 --- a/test/bidir_vec_remove_edge.cpp +++ b/test/bidir_vec_remove_edge.cpp @@ -40,7 +40,7 @@ test_main(int, char*[]) // e2 has been invalidated, so grab it again bool b2; - tie(e2, b2) = boost::edge(1, 0, g); + boost::tie(e2, b2) = boost::edge(1, 0, g); BOOST_CHECK( b2 ); BOOST_CHECK( g[e2].weight == 17 ); diff --git a/test/boykov_kolmogorov_max_flow_test.cpp b/test/boykov_kolmogorov_max_flow_test.cpp index b3f7f143..17607fce 100644 --- a/test/boykov_kolmogorov_max_flow_test.cpp +++ b/test/boykov_kolmogorov_max_flow_test.cpp @@ -68,7 +68,7 @@ fill_random_max_flow_graph(Graph& g, CapacityMap cap, ReverseEdgeMap rev, typena //randomize edge-capacities //randomize_property (g,int_gen); //we cannot use this, as we have no idea how properties are stored, right? typename graph_traits::edge_iterator ei, e_end; - for(tie(ei,e_end) = edges(g); ei != e_end; ++ei) + for(boost::tie(ei,e_end) = edges(g); ei != e_end; ++ei) cap[*ei] = int_gen(); //get source and sink node @@ -79,7 +79,7 @@ fill_random_max_flow_graph(Graph& g, CapacityMap cap, ReverseEdgeMap rev, typena //add reverse edges (ugly... how to do better?!) std::list edges_copy; - tie(ei, e_end) = edges(g); + boost::tie(ei, e_end) = edges(g); std::copy(ei, e_end, std::back_insert_iterator< std::list >(edges_copy)); while(!edges_copy.empty()){ edge_descriptor old_edge = edges_copy.front(); @@ -88,7 +88,7 @@ fill_random_max_flow_graph(Graph& g, CapacityMap cap, ReverseEdgeMap rev, typena vertex_descriptor target_vertex = source(old_edge, g); bool inserted; edge_descriptor new_edge; - tie(new_edge,inserted) = add_edge(source_vertex, target_vertex, g); + boost::tie(new_edge,inserted) = add_edge(source_vertex, target_vertex, g); assert(inserted); rev[old_edge] = new_edge; rev[new_edge] = old_edge ; @@ -111,7 +111,7 @@ long test_adjacency_list_vecS(int n_verts, int n_edges, std::size_t seed){ tVectorGraph g; graph_traits::vertex_descriptor src,sink; - tie(src,sink) = fill_random_max_flow_graph(g, get(edge_capacity,g), get(edge_reverse, g), n_verts, n_edges, seed); + boost::tie(src,sink) = fill_random_max_flow_graph(g, get(edge_capacity,g), get(edge_reverse, g), n_verts, n_edges, seed); return boykov_kolmogorov_max_flow(g, get(edge_capacity, g), get(edge_residual_capacity, g), @@ -137,12 +137,12 @@ long test_adjacency_list_listS(int n_verts, int n_edges, std::size_t seed){ tListGraph g; graph_traits::vertex_descriptor src,sink; - tie(src,sink) = fill_random_max_flow_graph(g, get(edge_capacity,g), get(edge_reverse, g), n_verts, n_edges, seed); + boost::tie(src,sink) = fill_random_max_flow_graph(g, get(edge_capacity,g), get(edge_reverse, g), n_verts, n_edges, seed); //initialize vertex indices graph_traits::vertex_iterator vi,v_end; graph_traits::vertices_size_type index = 0; - for(tie(vi, v_end) = vertices(g); vi != v_end; ++vi){ + for(boost::tie(vi, v_end) = vertices(g); vi != v_end; ++vi){ put(vertex_index, g, *vi, index++); } return boykov_kolmogorov_max_flow(g, get(edge_capacity, g), @@ -178,7 +178,7 @@ long test_bundled_properties(int n_verts, int n_edges, std::size_t seed){ tBundleGraph g; graph_traits::vertex_descriptor src,sink; - tie(src,sink) = fill_random_max_flow_graph(g, get(&tEdge::edge_capacity,g), get(&tEdge::edge_reverse, g), n_verts, n_edges, seed); + boost::tie(src,sink) = fill_random_max_flow_graph(g, get(&tEdge::edge_capacity,g), get(&tEdge::edge_reverse, g), n_verts, n_edges, seed); return boykov_kolmogorov_max_flow(g, get(&tEdge::edge_capacity, g), get(&tEdge::edge_residual_capacity, g), get(&tEdge::edge_reverse, g), @@ -199,7 +199,7 @@ long test_overloads(int n_verts, int n_edges, std::size_t seed){ tGraph g; graph_traits::vertex_descriptor src,sink; - tie(src,sink) = fill_random_max_flow_graph(g, get(edge_capacity,g), get(edge_reverse, g), n_verts, n_edges, seed); + boost::tie(src,sink) = fill_random_max_flow_graph(g, get(edge_capacity,g), get(edge_reverse, g), n_verts, n_edges, seed); std::vector::edge_descriptor> predecessor_vec(n_verts); std::vector color_vec(n_verts); @@ -272,7 +272,7 @@ class boykov_kolmogorov_test bool is_active = (tSuper::m_in_active_list_map[v] && (tSuper::has_parent(v) || it != tSuper::m_orphans.end() )); if(this->get_tree(v) != tColorTraits::gray() && !is_active){ typename graph_traits::out_edge_iterator ei,e_end; - for(tie(ei, e_end) = out_edges(v, tSuper::m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(v, tSuper::m_g); ei != e_end; ++ei){ const tVertex& other_node = target(*ei, tSuper::m_g); if(this->get_tree(other_node) != this->get_tree(v)){ if(this->get_tree(v) == tColorTraits::black()) @@ -342,7 +342,7 @@ class boykov_kolmogorov_test void check_invariants(){ tVertexIterator vi, v_end; - for(tie(vi, v_end) = vertices(tSuper::m_g); vi != v_end; ++vi){ + for(boost::tie(vi, v_end) = vertices(tSuper::m_g); vi != v_end; ++vi){ invariant_four(*vi); invariant_five(*vi); invariant_six(*vi); @@ -359,7 +359,7 @@ class boykov_kolmogorov_test while(true){ bool path_found; tEdge connecting_edge; - tie(connecting_edge, path_found) = this->grow(); //find a path from source to sink + boost::tie(connecting_edge, path_found) = this->grow(); //find a path from source to sink if(!path_found){ //we're finished, no more paths were found break; @@ -375,13 +375,13 @@ class boykov_kolmogorov_test //check if flow is the sum of outgoing edges of src tOutEdgeIterator ei, e_end; tEdgeVal src_sum = 0; - for(tie(ei, e_end) = out_edges(this->m_source, this->m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(this->m_source, this->m_g); ei != e_end; ++ei){ src_sum += this->m_cap_map[*ei] - this->m_res_cap_map[*ei]; } BOOST_CHECK(this->m_flow == src_sum); //check if flow is the sum of ingoing edges of sink tEdgeVal sink_sum = 0; - for(tie(ei, e_end) = out_edges(this->m_sink, this->m_g); ei != e_end; ++ei){ + for(boost::tie(ei, e_end) = out_edges(this->m_sink, this->m_g); ei != e_end; ++ei){ tEdge in_edge = this->m_rev_edge_map[*ei]; sink_sum += this->m_cap_map[in_edge] - this->m_res_cap_map[in_edge]; } @@ -405,7 +405,7 @@ long test_algorithms_invariant(int n_verts, int n_edges, std::size_t seed) tVectorGraph g; graph_traits::vertex_descriptor src, sink; - tie(src,sink) = fill_random_max_flow_graph(g, get(edge_capacity,g), get(edge_reverse, g), n_verts, n_edges, seed); + boost::tie(src,sink) = fill_random_max_flow_graph(g, get(edge_capacity,g), get(edge_reverse, g), n_verts, n_edges, seed); typedef property_map::type tEdgeCapMap; typedef property_map::type tEdgeResCapMap; diff --git a/test/cycle_ratio_tests.cpp b/test/cycle_ratio_tests.cpp index e98996b5..f7ca6921 100644 --- a/test/cycle_ratio_tests.cpp +++ b/test/cycle_ratio_tests.cpp @@ -333,7 +333,7 @@ int test_main(int argc, char* argv[]) typedef graph_traits::vertex_iterator VertexItM; typedef graph_traits::edge_descriptor EdgeM; VertexItM vi1, vi2, vi_end; - for (tie(vi1, vi_end) = vertices(gm); vi1 != vi_end; ++vi1) + for (boost::tie(vi1, vi_end) = vertices(gm); vi1 != vi_end; ++vi1) { for (vi2 = vertices(gm).first; vi2 != vi_end; ++vi2) add_edge(*vi1, *vi2, gm); diff --git a/test/dijkstra_heap_performance.cpp b/test/dijkstra_heap_performance.cpp index 0b78f740..72d40f9c 100644 --- a/test/dijkstra_heap_performance.cpp +++ b/test/dijkstra_heap_performance.cpp @@ -100,7 +100,7 @@ int main(int argc, char* argv[]) std::cout << n << " vertices, " << num_edges(g) << " edges.\n"; uniform_real rand01(0.0, 1.0); graph_traits::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) put(edge_weight, g, *ei, rand01(gen)); std::vector binary_heap_distances(n); diff --git a/test/dominator_tree_test.cpp b/test/dominator_tree_test.cpp index 698757f0..b10538e6 100644 --- a/test/dominator_tree_test.cpp +++ b/test/dominator_tree_test.cpp @@ -238,7 +238,7 @@ int test_main(int, char*[]) IndexMap indexMap(get(vertex_index, g)); graph_traits::vertex_iterator uItr, uEnd; int j = 0; - for (tie(uItr, uEnd) = vertices(g); uItr != uEnd; ++uItr, ++j) + for (boost::tie(uItr, uEnd) = vertices(g); uItr != uEnd; ++uItr, ++j) { put(indexMap, *uItr, j); } @@ -252,7 +252,7 @@ int test_main(int, char*[]) lengauer_tarjan_dominator_tree(g, vertex(0, g), domTreePredMap); vector idom(num_vertices(g)); - for (tie(uItr, uEnd) = vertices(g); uItr != uEnd; ++uItr) + for (boost::tie(uItr, uEnd) = vertices(g); uItr != uEnd; ++uItr) { if (get(domTreePredMap, *uItr) != graph_traits::null_vertex()) idom[get(indexMap, *uItr)] = @@ -276,7 +276,7 @@ int test_main(int, char*[]) iterative_bit_vector_dominator_tree(g, vertex(0, g), domTreePredMap); vector idom2(num_vertices(g)); - for (tie(uItr, uEnd) = vertices(g); uItr != uEnd; ++uItr) + for (boost::tie(uItr, uEnd) = vertices(g); uItr != uEnd; ++uItr) { if (get(domTreePredMap, *uItr) != graph_traits::null_vertex()) idom2[get(indexMap, *uItr)] = diff --git a/test/graphml_test.cpp b/test/graphml_test.cpp index a69f66d3..972768e8 100644 --- a/test/graphml_test.cpp +++ b/test/graphml_test.cpp @@ -74,11 +74,11 @@ int main(int argc, char** argv) assert(num_edges(g) == num_edges(g2)); graph_traits::vertex_iterator v, v_end; - for (tie(v,v_end) = vertices(g); v != v_end; ++v) + for (boost::tie(v,v_end) = vertices(g); v != v_end; ++v) assert(get(vertex_color_t(), g, *v) == get(vertex_color_t(), g2, *v)); graph_traits::edge_iterator e, e_end; - for (tie(e,e_end) = edges(g); e != e_end; ++e) + for (boost::tie(e,e_end) = edges(g); e != e_end; ++e) assert(get(edge_weight_t(), g, *e) == get(edge_weight_t(), g2, *e)); return 0; diff --git a/test/index_graph.cpp b/test/index_graph.cpp index efba110c..b988179f 100644 --- a/test/index_graph.cpp +++ b/test/index_graph.cpp @@ -77,7 +77,7 @@ void build() // Each vertex should be numbered correctly. Iterator i, end; - tie(i, end) = vertices(g); + boost::tie(i, end) = vertices(g); for(size_t x = 0; i != end; ++i, ++x) { BOOST_ASSERT(get_vertex_index(*i, g) == x); } diff --git a/test/layout_test.cpp b/test/layout_test.cpp index 19f8c992..7f85614a 100644 --- a/test/layout_test.cpp +++ b/test/layout_test.cpp @@ -41,7 +41,7 @@ void print_graph_layout(const Graph& g, PositionMap position, const Topology& to typename graph_traits::vertex_iterator vi, vi_end; // Find vertex at this position typename graph_traits::vertices_size_type index = 0; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi, ++index) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi, ++index) { if ((int)position[*vi][0] == x && (int)position[*vi][1] == y) break; } @@ -60,14 +60,14 @@ void dump_graph_layout(std::string name, const Graph& g, PositionMap position) out << "graph " << name << " {" << std::endl; typename graph_traits::vertex_iterator vi, vi_end; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) { out << " n" << get(vertex_index, g, *vi) << "[ pos=\"" << (int)position[*vi][0] + 25 << ", " << (int)position[*vi][1] + 25 << "\" ];\n"; } typename graph_traits::edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { out << " n" << get(vertex_index, g, source(*ei, g)) << " -- n" << get(vertex_index, g, target(*ei, g)) << ";\n"; } @@ -172,11 +172,11 @@ test_cube(Graph*) vertex_iterator vi, vi_end; int i = 0; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) put(vertex_index, g, *vi, i++); edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { put(edge_weight, g, *ei, 1.0); std::cerr << "(" << (char)(get(vertex_index, g, source(*ei, g)) + 'A') << ", " << (char)(get(vertex_index, g, target(*ei, g)) + 'A') @@ -241,11 +241,11 @@ test_triangular(Graph*) vertex_iterator vi, vi_end; int i = 0; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) put(vertex_index, g, *vi, i++); edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { put(edge_weight, g, *ei, 1.0); std::cerr << "(" << (char)(get(vertex_index, g, source(*ei, g)) + 'A') << ", " << (char)(get(vertex_index, g, target(*ei, g)) + 'A') @@ -313,11 +313,11 @@ test_disconnected(Graph*) vertex_iterator vi, vi_end; int i = 0; - for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) + for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) put(vertex_index, g, *vi, i++); edge_iterator ei, ei_end; - for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { + for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) { put(edge_weight, g, *ei, 1.0); std::cerr << "(" << (char)(get(vertex_index, g, source(*ei, g)) + 'A') << ", " << (char)(get(vertex_index, g, target(*ei, g)) + 'A') diff --git a/test/matching_test.cpp b/test/matching_test.cpp index 81dd566e..784fca58 100644 --- a/test/matching_test.cpp +++ b/test/matching_test.cpp @@ -51,7 +51,7 @@ struct vertex_index_installer vertex_iterator_t vi, vi_end; v_size_t i = 0; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi, ++i) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi, ++i) put(vertex_index, g, *vi, i); } }; @@ -66,8 +66,8 @@ void complete_graph(Graph& g, int n) g = Graph(n); vertex_iterator_t vi, vi_end, wi; - tie(vi,vi_end) = vertices(g); - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + boost::tie(vi,vi_end) = vertices(g); + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) { wi = vi; ++wi; @@ -92,7 +92,7 @@ void gabows_graph(Graph& g, int n) vertex_iterator_t vi, vi_end, ui, ui_end, halfway; - tie(ui,ui_end) = vertices(g); + boost::tie(ui,ui_end) = vertices(g); halfway = ui; for(int i = 0; i < n; ++i) @@ -111,7 +111,7 @@ void gabows_graph(Graph& g, int n) ++ui; } - tie(ui,ui_end) = vertices(g); + boost::tie(ui,ui_end) = vertices(g); while(halfway != ui_end) { @@ -233,7 +233,7 @@ void matching_test(std::size_t num_v, const std::string& graph_name) //Now remove an edge from the edmonds_mate matching. vertex_iterator_t vi,vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) if (edmonds_mate[*vi] != graph_traits::null_vertex()) break; @@ -299,7 +299,7 @@ void matching_test(std::size_t num_v, const std::string& graph_name) vertex_descriptor_t v = random_vertex(j,rand_num); if (u != v) { - tie(tuples::ignore, success) = add_edge(u, v, j); + boost::tie(tuples::ignore, success) = add_edge(u, v, j); if (success) num_edges++; } @@ -316,7 +316,7 @@ void matching_test(std::size_t num_v, const std::string& graph_name) } //Now remove an edge from the random_mate matching. - for(tie(vi,vi_end) = vertices(j); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(j); vi != vi_end; ++vi) if (random_mate[*vi] != graph_traits::null_vertex()) break; diff --git a/test/max_flow_test.cpp b/test/max_flow_test.cpp index 5074e854..8cd5e4a2 100644 --- a/test/max_flow_test.cpp +++ b/test/max_flow_test.cpp @@ -107,7 +107,7 @@ int test_main(int argc, char* argv[]) property_map < Graph, edge_capacity_t >::type cap = get(edge_capacity, g); std::list edges_copy; graph_traits::edge_iterator ei, e_end; - tie(ei, e_end) = edges(g); + boost::tie(ei, e_end) = edges(g); std::copy(ei, e_end, std::back_insert_iterator< std::list >(edges_copy)); while( ! edges_copy.empty()){ tEdge old_edge=edges_copy.front(); @@ -116,7 +116,7 @@ int test_main(int argc, char* argv[]) tVertex target_vertex = source(old_edge, g); bool inserted; tEdge new_edge; - tie(new_edge,inserted) = add_edge(source_vertex, target_vertex, g); + boost::tie(new_edge,inserted) = add_edge(source_vertex, target_vertex, g); assert(inserted); rev[old_edge] = new_edge; rev[new_edge] = old_edge ; diff --git a/test/metric_tsp_approx.cpp b/test/metric_tsp_approx.cpp index 4c223fba..111a8e26 100644 --- a/test/metric_tsp_approx.cpp +++ b/test/metric_tsp_approx.cpp @@ -65,7 +65,7 @@ void connectAllEuclidean(VertexListGraph& g, pow(static_cast(points[vmap[*dest]].y - points[vmap[*src]].y), 2.0))); - tie(e, inserted) = add_edge(*src, *dest, g); + boost::tie(e, inserted) = add_edge(*src, *dest, g); wmap[e] = weight; } @@ -152,7 +152,7 @@ void checkAdjList(PositionVec v) //create vertex index map VItr vi, ve; int idx(0); - for (tie(vi, ve) = vertices(g); vi != ve; ++vi) + for (boost::tie(vi, ve) = vertices(g); vi != ve; ++vi) { Vertex v(*vi); v_pmap[v] = idx; diff --git a/test/property_iter.cpp b/test/property_iter.cpp index 9ff0d642..150061e9 100644 --- a/test/property_iter.cpp +++ b/test/property_iter.cpp @@ -123,7 +123,7 @@ int main(int, char* []) TLinkIterator itEdgeBegin, itEdgeEnd; - tie(itEdgeBegin, itEdgeEnd) = get_property_iter_range(g, edge_id); + boost::tie(itEdgeBegin, itEdgeEnd) = get_property_iter_range(g, edge_id); cout << "Edge iteration:" << endl; for (; itEdgeBegin != itEdgeEnd; ++itEdgeBegin) @@ -134,7 +134,7 @@ int main(int, char* []) TNodeIterator itVertexBegin, itVertexEnd; - tie(itVertexBegin, itVertexEnd) = get_property_iter_range(g, vertex_id); + boost::tie(itVertexBegin, itVertexEnd) = get_property_iter_range(g, vertex_id); cout << "Vertex iteration:" << endl; for (; itVertexBegin != itVertexEnd; ++itVertexBegin) diff --git a/test/random_matching_test.cpp b/test/random_matching_test.cpp index e5d55773..7622e694 100644 --- a/test/random_matching_test.cpp +++ b/test/random_matching_test.cpp @@ -60,7 +60,7 @@ int main(int argc, char** argv) if (u != v) { if (!edge(u,v,g).second) - tie(tuples::ignore, success) = add_edge(u, v, g); + boost::tie(tuples::ignore, success) = add_edge(u, v, g); else success = false; @@ -79,13 +79,13 @@ int main(int argc, char** argv) std::cout << "Graph has edges: "; typedef graph_traits::edge_iterator edge_iterator_t; edge_iterator_t ei,ei_end; - for(tie(ei,ei_end) = edges(g); ei != ei_end; ++ei) + for(boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei) std:: cout << *ei << ", "; std::cout << std::endl; std::cout << "Matching is: "; vertex_iterator_t vi, vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) if (mate[*vi] != graph_traits::null_vertex() && *vi < mate[*vi]) std::cout << "{" << *vi << "," << mate[*vi] << "}, "; @@ -94,7 +94,7 @@ int main(int argc, char** argv) //Now remove an edge from the random_mate matching. vertex_iterator_t vi, vi_end; - for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) + for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi) if (mate[*vi] != graph_traits::null_vertex()) break; diff --git a/test/subgraph.cpp b/test/subgraph.cpp index bb6011d6..d0154a31 100644 --- a/test/subgraph.cpp +++ b/test/subgraph.cpp @@ -105,7 +105,7 @@ int test_main(int, char*[]) subgraph_t sub = g.create_subgraph(vertices(g).first, vertices(g).second); graph_t::edge_iterator ei, ee; - for (tie(ei, ee) = edges(sub); ei != ee; ++ei) { + for (boost::tie(ei, ee) = edges(sub); ei != ee; ++ei) { // This used to segfault. get(edge_weight, sub, *ei); } diff --git a/test/subgraph_bundled.cpp b/test/subgraph_bundled.cpp index 8bad04b1..81629c95 100644 --- a/test/subgraph_bundled.cpp +++ b/test/subgraph_bundled.cpp @@ -125,7 +125,7 @@ int test_main(int, char*[]) Subgraph sub = g.create_subgraph(vertices(g).first, vertices(g).second); graph_traits::edge_iterator ei, ee; - for (tie(ei, ee) = edges(sub); ei != ee; ++ei) { + for (boost::tie(ei, ee) = edges(sub); ei != ee; ++ei) { // This used to segfault. get(edge_weight, sub, *ei); } diff --git a/test/transitive_closure_test.cpp b/test/transitive_closure_test.cpp index c84a2527..16ec350f 100644 --- a/test/transitive_closure_test.cpp +++ b/test/transitive_closure_test.cpp @@ -42,7 +42,7 @@ num_incident(typename graph_traits::vertex_descriptor u, { typename graph_traits::degree_size_type d = 0; typename graph_traits::out_edge_iterator i, i_end; - for (tie(i, i_end) = out_edges(u, g); i != i_end; ++i) + for (boost::tie(i, i_end) = out_edges(u, g); i != i_end; ++i) if (target(*i, g) == v) ++d; return d; @@ -57,13 +57,13 @@ template bool check_transitive_closure(Graph& g, GraphTC& tc) { typename graph_traits::vertex_iterator i, i_end; - for (tie(i, i_end) = vertices(g); i != i_end; ++i) { + for (boost::tie(i, i_end) = vertices(g); i != i_end; ++i) { typename graph_traits::vertex_iterator j, j_end; - for (tie(j, j_end) = vertices(g); j != j_end; ++j) { + for (boost::tie(j, j_end) = vertices(g); j != j_end; ++j) { bool g_has_edge; typename graph_traits::edge_descriptor e_g; typename graph_traits::degree_size_type num_tc; - tie (e_g, g_has_edge) = edge(*i, *j, g); + boost::tie (e_g, g_has_edge) = edge(*i, *j, g); num_tc = num_incident(*i, *j, tc); if (*i == *j) { if (g_has_edge) { @@ -72,7 +72,7 @@ bool check_transitive_closure(Graph& g, GraphTC& tc) } else { bool can_reach = false; typename graph_traits::adjacency_iterator k, k_end; - for (tie(k, k_end) = adjacent_vertices(*i, g); k != k_end; ++k) { + for (boost::tie(k, k_end) = adjacent_vertices(*i, g); k != k_end; ++k) { std::vector color_map_vec(num_vertices(g)); if (is_reachable(*k, *i, g, &color_map_vec[0])) { can_reach = true;