# HG changeset patch # User Alpar Juttner # Date 1354100727 -3600 # Node ID 36fa2fee7144bb1dad3b364d67a1ca097f547686 # Parent 764826c6e2b451f09cfa6e588a3de005bc308154# Parent a26b90a17c81e068cb8777e356b4552a80c611d1 Merge bugfix #453 diff -r 764826c6e2b4 -r 36fa2fee7144 lemon/concepts/graph_components.h --- a/lemon/concepts/graph_components.h Thu Nov 08 09:07:41 2012 +0100 +++ b/lemon/concepts/graph_components.h Wed Nov 28 12:05:27 2012 +0100 @@ -108,6 +108,8 @@ i1 = i2 = i3; bool b; + ignore_unused_variable_warning(b); + b = (ia == ib) && (ia != ib); b = (ia == INVALID) && (ib != INVALID); b = (ia < ib); diff -r 764826c6e2b4 -r 36fa2fee7144 test/bellman_ford_test.cc --- a/test/bellman_ford_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/bellman_ford_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -65,8 +65,10 @@ Node s, t, n; Arc e; Value l; + ignore_unused_variable_warning(l); int k=3; bool b; + ignore_unused_variable_warning(b); BF::DistMap d(gr); BF::PredMap p(gr); LengthMap length; @@ -147,6 +149,8 @@ Digraph g; bool b; + ignore_unused_variable_warning(b); + bellmanFord(g,LengthMap()).run(Node()); b = bellmanFord(g,LengthMap()).run(Node(),Node()); bellmanFord(g,LengthMap()) diff -r 764826c6e2b4 -r 36fa2fee7144 test/bfs_test.cc --- a/test/bfs_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/bfs_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -61,6 +61,7 @@ Node s, t, n; Arc e; int l, i; + ignore_unused_variable_warning(l,i); bool b; BType::DistMap d(G); BType::PredMap p(G); @@ -150,6 +151,8 @@ Digraph g; bool b; + ignore_unused_variable_warning(b); + bfs(g).run(Node()); b=bfs(g).run(Node(),Node()); bfs(g).run(); diff -r 764826c6e2b4 -r 36fa2fee7144 test/circulation_test.cc --- a/test/circulation_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/circulation_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -73,6 +73,7 @@ BarrierMap bar; VType v; bool b; + ignore_unused_variable_warning(v,b); typedef Circulation ::SetFlowMap diff -r 764826c6e2b4 -r 36fa2fee7144 test/dfs_test.cc --- a/test/dfs_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/dfs_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -67,6 +67,8 @@ Arc e; int l, i; bool b; + ignore_unused_variable_warning(l,i,b); + DType::DistMap d(G); DType::PredMap p(G); Path pp; @@ -151,6 +153,8 @@ Digraph g; bool b; + ignore_unused_variable_warning(b); + dfs(g).run(Node()); b=dfs(g).run(Node(),Node()); dfs(g).run(); diff -r 764826c6e2b4 -r 36fa2fee7144 test/dijkstra_test.cc --- a/test/dijkstra_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/dijkstra_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -65,6 +65,8 @@ VType l; int i; bool b; + ignore_unused_variable_warning(l,i,b); + DType::DistMap d(G); DType::PredMap p(G); LengthMap length; @@ -162,6 +164,8 @@ Digraph g; bool b; + ignore_unused_variable_warning(b); + dijkstra(g,LengthMap()).run(Node()); b=dijkstra(g,LengthMap()).run(Node(),Node()); dijkstra(g,LengthMap()) diff -r 764826c6e2b4 -r 36fa2fee7144 test/gomory_hu_test.cc --- a/test/gomory_hu_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/gomory_hu_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -68,6 +68,7 @@ CutMap cut; Value v; int d; + ignore_unused_variable_warning(v,d); GomoryHu gh_test(g, cap); const GomoryHu& diff -r 764826c6e2b4 -r 36fa2fee7144 test/hao_orlin_test.cc --- a/test/hao_orlin_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/hao_orlin_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -66,6 +66,7 @@ CapMap cap; CutMap cut; Value v; + ignore_unused_variable_warning(v); HaoOrlin ho_test(g, cap); const HaoOrlin& diff -r 764826c6e2b4 -r 36fa2fee7144 test/matching_test.cc --- a/test/matching_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/matching_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -145,6 +145,7 @@ MaxMatching::Status stat = const_mat_test.status(n); + ignore_unused_variable_warning(stat); const MaxMatching::StatusMap& smap = const_mat_test.statusMap(); stat = smap[n]; diff -r 764826c6e2b4 -r 36fa2fee7144 test/min_cost_arborescence_test.cc --- a/test/min_cost_arborescence_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/min_cost_arborescence_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -91,6 +91,7 @@ Arc e; VType c; bool b; + ignore_unused_variable_warning(c,b); int i; CostMap cost; ArbMap arb; diff -r 764826c6e2b4 -r 36fa2fee7144 test/preflow_test.cc --- a/test/preflow_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/preflow_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -86,6 +86,7 @@ CutMap cut; VType v; bool b; + ignore_unused_variable_warning(v,b); typedef Preflow ::SetFlowMap diff -r 764826c6e2b4 -r 36fa2fee7144 test/suurballe_test.cc --- a/test/suurballe_test.cc Thu Nov 08 09:07:41 2012 +0100 +++ b/test/suurballe_test.cc Wed Nov 28 12:05:27 2012 +0100 @@ -117,6 +117,8 @@ int f; VType c; + ignore_unused_variable_warning(f,c); + c = const_suurb_test.totalLength(); f = const_suurb_test.flow(e); const SuurballeType::FlowMap& fm =