# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1354100556 -3600
# Node ID 1fe3b4ad8caa96fc424885da7c4470d8bca87ee3
# Parent  774349a16ba0b46a2ce8cc3c2ef41ec89a7898f3# Parent  a26b90a17c81e068cb8777e356b4552a80c611d1
Merge bugfix #453 to branch 1.2

diff -r 774349a16ba0 -r 1fe3b4ad8caa lemon/concepts/graph_components.h
--- a/lemon/concepts/graph_components.h	Wed Nov 07 18:13:26 2012 +0100
+++ b/lemon/concepts/graph_components.h	Wed Nov 28 12:02:36 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 774349a16ba0 -r 1fe3b4ad8caa test/bellman_ford_test.cc
--- a/test/bellman_ford_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/bellman_ford_test.cc	Wed Nov 28 12:02:36 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 774349a16ba0 -r 1fe3b4ad8caa test/bfs_test.cc
--- a/test/bfs_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/bfs_test.cc	Wed Nov 28 12:02:36 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 774349a16ba0 -r 1fe3b4ad8caa test/circulation_test.cc
--- a/test/circulation_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/circulation_test.cc	Wed Nov 28 12:02:36 2012 +0100
@@ -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 -r 774349a16ba0 -r 1fe3b4ad8caa test/dfs_test.cc
--- a/test/dfs_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/dfs_test.cc	Wed Nov 28 12:02:36 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<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 -r 774349a16ba0 -r 1fe3b4ad8caa test/dijkstra_test.cc
--- a/test/dijkstra_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/dijkstra_test.cc	Wed Nov 28 12:02:36 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 774349a16ba0 -r 1fe3b4ad8caa test/gomory_hu_test.cc
--- a/test/gomory_hu_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/gomory_hu_test.cc	Wed Nov 28 12:02:36 2012 +0100
@@ -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 -r 774349a16ba0 -r 1fe3b4ad8caa test/hao_orlin_test.cc
--- a/test/hao_orlin_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/hao_orlin_test.cc	Wed Nov 28 12:02:36 2012 +0100
@@ -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 -r 774349a16ba0 -r 1fe3b4ad8caa test/matching_test.cc
--- a/test/matching_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/matching_test.cc	Wed Nov 28 12:02:36 2012 +0100
@@ -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 -r 774349a16ba0 -r 1fe3b4ad8caa test/min_cost_arborescence_test.cc
--- a/test/min_cost_arborescence_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/min_cost_arborescence_test.cc	Wed Nov 28 12:02:36 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 774349a16ba0 -r 1fe3b4ad8caa test/preflow_test.cc
--- a/test/preflow_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/preflow_test.cc	Wed Nov 28 12:02:36 2012 +0100
@@ -86,6 +86,7 @@
   CutMap cut;
   VType v;
   bool b;
+  ignore_unused_variable_warning(v,b);
 
   typedef Preflow<Digraph, CapMap>
             ::SetFlowMap<FlowMap>
diff -r 774349a16ba0 -r 1fe3b4ad8caa test/suurballe_test.cc
--- a/test/suurballe_test.cc	Wed Nov 07 18:13:26 2012 +0100
+++ b/test/suurballe_test.cc	Wed Nov 28 12:02:36 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 =