1.1 --- a/lemon/concepts/bpgraph.h Wed Aug 07 07:04:58 2013 +0200
1.2 +++ b/lemon/concepts/bpgraph.h Wed Aug 07 07:08:38 2013 +0200
1.3 @@ -523,7 +523,10 @@
1.4
1.5 /// Sets the iterator to the first arc of the given graph.
1.6 ///
1.7 - explicit ArcIt(const BpGraph &g) { ignore_unused_variable_warning(g); }
1.8 + explicit ArcIt(const BpGraph &g)
1.9 + {
1.10 + ::lemon::ignore_unused_variable_warning(g);
1.11 + }
1.12 /// Sets the iterator to the given arc.
1.13
1.14 /// Sets the iterator to the given arc of the given graph.
1.15 @@ -569,8 +572,8 @@
1.16 /// Sets the iterator to the first outgoing arc of the given node.
1.17 ///
1.18 OutArcIt(const BpGraph& n, const Node& g) {
1.19 - ignore_unused_variable_warning(n);
1.20 - ignore_unused_variable_warning(g);
1.21 + ::lemon::ignore_unused_variable_warning(n);
1.22 + ::lemon::ignore_unused_variable_warning(g);
1.23 }
1.24 /// Sets the iterator to the given arc.
1.25
1.26 @@ -617,8 +620,8 @@
1.27 /// Sets the iterator to the first incoming arc of the given node.
1.28 ///
1.29 InArcIt(const BpGraph& g, const Node& n) {
1.30 - ignore_unused_variable_warning(n);
1.31 - ignore_unused_variable_warning(g);
1.32 + ::lemon::ignore_unused_variable_warning(n);
1.33 + ::lemon::ignore_unused_variable_warning(g);
1.34 }
1.35 /// Sets the iterator to the given arc.
1.36
2.1 --- a/lemon/concepts/graph_components.h Wed Aug 07 07:04:58 2013 +0200
2.2 +++ b/lemon/concepts/graph_components.h Wed Aug 07 07:08:38 2013 +0200
2.3 @@ -456,7 +456,7 @@
2.4 bn = bpgraph.asBlueNodeUnsafe(bnan);
2.5 rn = bpgraph.asRedNode(rnan);
2.6 bn = bpgraph.asBlueNode(bnan);
2.7 - ignore_unused_variable_warning(b);
2.8 + ::lemon::ignore_unused_variable_warning(b);
2.9 }
2.10 }
2.11
2.12 @@ -653,8 +653,8 @@
2.13 int bid = bpgraph.id(blue);
2.14 rid = bpgraph.maxRedId();
2.15 bid = bpgraph.maxBlueId();
2.16 - ignore_unused_variable_warning(rid);
2.17 - ignore_unused_variable_warning(bid);
2.18 + ::lemon::ignore_unused_variable_warning(rid);
2.19 + ::lemon::ignore_unused_variable_warning(bid);
2.20 }
2.21
2.22 const _BpGraph& bpgraph;
2.23 @@ -1387,8 +1387,8 @@
2.24 = bpgraph.notifier(typename _BpGraph::RedNode());
2.25 typename _BpGraph::BlueNodeNotifier& bnn
2.26 = bpgraph.notifier(typename _BpGraph::BlueNode());
2.27 - ignore_unused_variable_warning(rnn);
2.28 - ignore_unused_variable_warning(bnn);
2.29 + ::lemon::ignore_unused_variable_warning(rnn);
2.30 + ::lemon::ignore_unused_variable_warning(bnn);
2.31 }
2.32
2.33 const _BpGraph& bpgraph;
3.1 --- a/test/max_flow_test.cc Wed Aug 07 07:04:58 2013 +0200
3.2 +++ b/test/max_flow_test.cc Wed Aug 07 07:08:38 2013 +0200
3.3 @@ -121,7 +121,7 @@
3.4 b = const_max_flow.minCut(n);
3.5 const_max_flow.minCutMap(cut);
3.6
3.7 - ignore_unused_variable_warning(fm);
3.8 + ::lemon::ignore_unused_variable_warning(fm);
3.9 }
3.10
3.11 };
3.12 @@ -156,7 +156,7 @@
3.13 preflow_test.startSecondPhase();
3.14 preflow_test.runMinCut();
3.15
3.16 - ignore_unused_variable_warning(b);
3.17 + ::lemon::ignore_unused_variable_warning(b);
3.18 }
3.19
3.20 // Checks the specific parts of EdmondsKarp's interface
3.21 @@ -179,7 +179,7 @@
3.22 b = ek_test.augment();
3.23 ek_test.start();
3.24
3.25 - ignore_unused_variable_warning(b);
3.26 + ::lemon::ignore_unused_variable_warning(b);
3.27 }
3.28
3.29
3.30 @@ -339,7 +339,7 @@
3.31 }
3.32
3.33 static void startSecondPhase(MF& mf) {
3.34 - ignore_unused_variable_warning(mf);
3.35 + ::lemon::ignore_unused_variable_warning(mf);
3.36 }
3.37
3.38 };
4.1 --- a/test/nagamochi_ibaraki_test.cc Wed Aug 07 07:04:58 2013 +0200
4.2 +++ b/test/nagamochi_ibaraki_test.cc Wed Aug 07 07:08:38 2013 +0200
4.3 @@ -65,7 +65,7 @@
4.4 CutMap cut;
4.5 Value v;
4.6 bool b;
4.7 - ignore_unused_variable_warning(v,b);
4.8 + ::lemon::ignore_unused_variable_warning(v,b);
4.9
4.10 NagamochiIbaraki<Graph, CapMap> ni_test(g, cap);
4.11 const NagamochiIbaraki<Graph, CapMap>& const_ni_test = ni_test;