Changeset 1087:dd1443e4a34c in lemon-main

Timestamp:

08/07/13 07:08:38 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Further ignore_unused_variable_warning() explicit namespaces (#294)

Files:

• lemon/concepts/bpgraph.h (modified) (3 diffs)
• lemon/concepts/graph_components.h (modified) (3 diffs)
• test/max_flow_test.cc (modified) (4 diffs)
• test/nagamochi_ibaraki_test.cc (modified) (1 diff)

lemon/concepts/bpgraph.h

@@ -524 +524 @@
         /// 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.
 
@@ -570 +573 @@
         ///
         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.
@@ -618 +621 @@
         ///
         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.

lemon/concepts/graph_components.h

@@ -457 +457 @@
             rn = bpgraph.asRedNode(rnan);
             bn = bpgraph.asBlueNode(bnan);
-            ignore_unused_variable_warning(b);
+            ::lemon::ignore_unused_variable_warning(b);
           }
         }
@@ -654 +654 @@
           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);
         }
 
@@ -1388 +1388 @@
           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);
         }
 

test/max_flow_test.cc

@@ -122 +122 @@
       const_max_flow.minCutMap(cut);
 
-      ignore_unused_variable_warning(fm);
+      ::lemon::ignore_unused_variable_warning(fm);
     }
 
@@ -157 +157 @@
   preflow_test.runMinCut();
 
-  ignore_unused_variable_warning(b);
+  ::lemon::ignore_unused_variable_warning(b);
 }
 
@@ -180 +180 @@
   ek_test.start();
 
-  ignore_unused_variable_warning(b);
+  ::lemon::ignore_unused_variable_warning(b);
 }
 
@@ -340 +340 @@
 
   static void startSecondPhase(MF& mf) {
-    ignore_unused_variable_warning(mf);
+    ::lemon::ignore_unused_variable_warning(mf);
   }
 

test/nagamochi_ibaraki_test.cc

@@ -66 +66 @@
   Value v;
   bool b;
-  ignore_unused_variable_warning(v,b);
+  ::lemon::ignore_unused_variable_warning(v,b);
 
   NagamochiIbaraki<Graph, CapMap> ni_test(g, cap);