[Lemon-commits] Alpar Juttner: Merge bugfix #453

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/36fa2fee7144
changeset: 1176:36fa2fee7144
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Wed Nov 28 12:05:27 2012 +0100
description:
	Merge bugfix #453

diffstat:

 lemon/concepts/graph_components.h  |  2 ++
 test/bellman_ford_test.cc          |  4 ++++
 test/bfs_test.cc                   |  3 +++
 test/circulation_test.cc           |  1 +
 test/dfs_test.cc                   |  4 ++++
 test/dijkstra_test.cc              |  4 ++++
 test/gomory_hu_test.cc             |  1 +
 test/hao_orlin_test.cc             |  1 +
 test/matching_test.cc              |  1 +
 test/min_cost_arborescence_test.cc |  1 +
 test/preflow_test.cc               |  1 +
 test/suurballe_test.cc             |  2 ++
 12 files changed, 25 insertions(+), 0 deletions(-)

diffs (175 lines):

diff --git a/lemon/concepts/graph_components.h b/lemon/concepts/graph_components.h
--- a/lemon/concepts/graph_components.h
+++ b/lemon/concepts/graph_components.h
@@ -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 --git a/test/bellman_ford_test.cc b/test/bellman_ford_test.cc
--- a/test/bellman_ford_test.cc
+++ b/test/bellman_ford_test.cc
@@ -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 --git a/test/bfs_test.cc b/test/bfs_test.cc
--- a/test/bfs_test.cc
+++ b/test/bfs_test.cc
@@ -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 --git a/test/circulation_test.cc b/test/circulation_test.cc
--- a/test/circulation_test.cc
+++ b/test/circulation_test.cc
@@ -73,6 +73,7 @@
   BarrierMap bar;
   VType v;
   bool b;
+  ignore_unused_variable_warning(v,b);
 
   typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
             ::SetFlowMap<FlowMap>
diff --git a/test/dfs_test.cc b/test/dfs_test.cc
--- a/test/dfs_test.cc
+++ b/test/dfs_test.cc
@@ -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<Digraph> 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 --git a/test/dijkstra_test.cc b/test/dijkstra_test.cc
--- a/test/dijkstra_test.cc
+++ b/test/dijkstra_test.cc
@@ -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 --git a/test/gomory_hu_test.cc b/test/gomory_hu_test.cc
--- a/test/gomory_hu_test.cc
+++ b/test/gomory_hu_test.cc
@@ -68,6 +68,7 @@
   CutMap cut;
   Value v;
   int d;
+  ignore_unused_variable_warning(v,d);
 
   GomoryHu<Graph, CapMap> gh_test(g, cap);
   const GomoryHu<Graph, CapMap>&
diff --git a/test/hao_orlin_test.cc b/test/hao_orlin_test.cc
--- a/test/hao_orlin_test.cc
+++ b/test/hao_orlin_test.cc
@@ -66,6 +66,7 @@
   CapMap cap;
   CutMap cut;
   Value v;
+  ignore_unused_variable_warning(v);
 
   HaoOrlin<Digraph, CapMap> ho_test(g, cap);
   const HaoOrlin<Digraph, CapMap>&
diff --git a/test/matching_test.cc b/test/matching_test.cc
--- a/test/matching_test.cc
+++ b/test/matching_test.cc
@@ -145,6 +145,7 @@
 
   MaxMatching<Graph>::Status stat =
     const_mat_test.status(n);
+  ignore_unused_variable_warning(stat);
   const MaxMatching<Graph>::StatusMap& smap =
     const_mat_test.statusMap();
   stat = smap[n];
diff --git a/test/min_cost_arborescence_test.cc b/test/min_cost_arborescence_test.cc
--- a/test/min_cost_arborescence_test.cc
+++ b/test/min_cost_arborescence_test.cc
@@ -91,6 +91,7 @@
   Arc e;
   VType c;
   bool b;
+  ignore_unused_variable_warning(c,b);
   int i;
   CostMap cost;
   ArbMap arb;
diff --git a/test/preflow_test.cc b/test/preflow_test.cc
--- a/test/preflow_test.cc
+++ b/test/preflow_test.cc
@@ -86,6 +86,7 @@
   CutMap cut;
   VType v;
   bool b;
+  ignore_unused_variable_warning(v,b);
 
   typedef Preflow<Digraph, CapMap>
             ::SetFlowMap<FlowMap>
diff --git a/test/suurballe_test.cc b/test/suurballe_test.cc
--- a/test/suurballe_test.cc
+++ b/test/suurballe_test.cc
@@ -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 =