[Lemon-commits] Alpar Juttner: Further ignore_unused_variable_wa...

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/dd1443e4a34c
changeset: 1262:dd1443e4a34c
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Wed Aug 07 07:08:38 2013 +0200
description:
	Further ignore_unused_variable_warning() explicit namespaces (#294)

diffstat:

 lemon/concepts/bpgraph.h          |  13 ++++++++-----
 lemon/concepts/graph_components.h |  10 +++++-----
 test/max_flow_test.cc             |   8 ++++----
 test/nagamochi_ibaraki_test.cc    |   2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diffs (122 lines):

diff --git a/lemon/concepts/bpgraph.h b/lemon/concepts/bpgraph.h
--- a/lemon/concepts/bpgraph.h
+++ b/lemon/concepts/bpgraph.h
@@ -523,7 +523,10 @@
 
         /// Sets the iterator to the first arc of the given graph.
         ///
-        explicit ArcIt(const BpGraph &g) { ignore_unused_variable_warning(g); }
+        explicit ArcIt(const BpGraph &g)
+        {
+          ::lemon::ignore_unused_variable_warning(g);
+        }
         /// Sets the iterator to the given arc.
 
         /// Sets the iterator to the given arc of the given graph.
@@ -569,8 +572,8 @@
         /// Sets the iterator to the first outgoing arc of the given node.
         ///
         OutArcIt(const BpGraph& n, const Node& g) {
-          ignore_unused_variable_warning(n);
-          ignore_unused_variable_warning(g);
+          ::lemon::ignore_unused_variable_warning(n);
+          ::lemon::ignore_unused_variable_warning(g);
         }
         /// Sets the iterator to the given arc.
 
@@ -617,8 +620,8 @@
         /// Sets the iterator to the first incoming arc of the given node.
         ///
         InArcIt(const BpGraph& g, const Node& n) {
-          ignore_unused_variable_warning(n);
-          ignore_unused_variable_warning(g);
+          ::lemon::ignore_unused_variable_warning(n);
+          ::lemon::ignore_unused_variable_warning(g);
         }
         /// Sets the iterator to the given arc.
 
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
@@ -456,7 +456,7 @@
             bn = bpgraph.asBlueNodeUnsafe(bnan);
             rn = bpgraph.asRedNode(rnan);
             bn = bpgraph.asBlueNode(bnan);
-            ignore_unused_variable_warning(b);
+            ::lemon::ignore_unused_variable_warning(b);
           }
         }
 
@@ -653,8 +653,8 @@
           int bid = bpgraph.id(blue);
           rid = bpgraph.maxRedId();
           bid = bpgraph.maxBlueId();
-          ignore_unused_variable_warning(rid);
-          ignore_unused_variable_warning(bid);
+          ::lemon::ignore_unused_variable_warning(rid);
+          ::lemon::ignore_unused_variable_warning(bid);
         }
 
         const _BpGraph& bpgraph;
@@ -1387,8 +1387,8 @@
             = bpgraph.notifier(typename _BpGraph::RedNode());
           typename _BpGraph::BlueNodeNotifier& bnn
             = bpgraph.notifier(typename _BpGraph::BlueNode());
-          ignore_unused_variable_warning(rnn);
-          ignore_unused_variable_warning(bnn);
+          ::lemon::ignore_unused_variable_warning(rnn);
+          ::lemon::ignore_unused_variable_warning(bnn);
         }
 
         const _BpGraph& bpgraph;
diff --git a/test/max_flow_test.cc b/test/max_flow_test.cc
--- a/test/max_flow_test.cc
+++ b/test/max_flow_test.cc
@@ -121,7 +121,7 @@
       b = const_max_flow.minCut(n);
       const_max_flow.minCutMap(cut);
 
-      ignore_unused_variable_warning(fm);
+      ::lemon::ignore_unused_variable_warning(fm);
     }
 
   };
@@ -156,7 +156,7 @@
   preflow_test.startSecondPhase();
   preflow_test.runMinCut();
 
-  ignore_unused_variable_warning(b);
+  ::lemon::ignore_unused_variable_warning(b);
 }
 
 // Checks the specific parts of EdmondsKarp's interface
@@ -179,7 +179,7 @@
   b = ek_test.augment();
   ek_test.start();
 
-  ignore_unused_variable_warning(b);
+  ::lemon::ignore_unused_variable_warning(b);
 }
 
 
@@ -339,7 +339,7 @@
   }
 
   static void startSecondPhase(MF& mf) {
-    ignore_unused_variable_warning(mf);
+    ::lemon::ignore_unused_variable_warning(mf);
   }
 
 };
diff --git a/test/nagamochi_ibaraki_test.cc b/test/nagamochi_ibaraki_test.cc
--- a/test/nagamochi_ibaraki_test.cc
+++ b/test/nagamochi_ibaraki_test.cc
@@ -65,7 +65,7 @@
   CutMap cut;
   Value v;
   bool b;
-  ignore_unused_variable_warning(v,b);
+  ::lemon::ignore_unused_variable_warning(v,b);
 
   NagamochiIbaraki<Graph, CapMap> ni_test(g, cap);
   const NagamochiIbaraki<Graph, CapMap>& const_ni_test = ni_test;