Merge #294 to branch 1.1 1.1
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 07 Aug 2013 06:31:47 +0200 (2013-08-07)
branch1.1
changeset 1258bdfc038f364c
parent 1248 14394c9603c2
parent 1257 3e711ee55d31
child 1267 bd24650d5cd2
Merge #294 to branch 1.1
lemon/concepts/digraph.h
lemon/concepts/graph_components.h
lemon/concepts/maps.h
test/adaptors_test.cc
test/bfs_test.cc
test/circulation_test.cc
test/connectivity_test.cc
test/dfs_test.cc
test/dijkstra_test.cc
test/edge_set_test.cc
test/euler_test.cc
test/gomory_hu_test.cc
test/hao_orlin_test.cc
test/maps_test.cc
test/matching_test.cc
test/min_cost_arborescence_test.cc
test/preflow_test.cc
test/suurballe_test.cc
     1.1 --- a/lemon/concept_check.h	Tue Aug 06 12:19:11 2013 +0200
     1.2 +++ b/lemon/concept_check.h	Wed Aug 07 06:31:47 2013 +0200
     1.3 @@ -58,7 +58,7 @@
     1.4    {
     1.5  #if !defined(NDEBUG)
     1.6      void (Concept::*x)() = & Concept::constraints;
     1.7 -    ignore_unused_variable_warning(x);
     1.8 +    ::lemon::ignore_unused_variable_warning(x);
     1.9  #endif
    1.10    }
    1.11  
    1.12 @@ -68,7 +68,7 @@
    1.13  #if !defined(NDEBUG)
    1.14      typedef typename Concept::template Constraints<Type> ConceptCheck;
    1.15      void (ConceptCheck::*x)() = & ConceptCheck::constraints;
    1.16 -    ignore_unused_variable_warning(x);
    1.17 +    ::lemon::ignore_unused_variable_warning(x);
    1.18  #endif
    1.19    }
    1.20  
     2.1 --- a/lemon/concepts/digraph.h	Tue Aug 06 12:19:11 2013 +0200
     2.2 +++ b/lemon/concepts/digraph.h	Wed Aug 07 06:31:47 2013 +0200
     2.3 @@ -324,7 +324,7 @@
     2.4  
     2.5          /// This constructor sets the iterator to the first arc of \c g.
     2.6          ///@param g the digraph
     2.7 -        ArcIt(const Digraph& g) { ignore_unused_variable_warning(g); }
     2.8 +        ArcIt(const Digraph& g) { ::lemon::ignore_unused_variable_warning(g); }
     2.9          /// Arc -> ArcIt conversion
    2.10  
    2.11          /// Sets the iterator to the value of the trivial iterator \c e.
     3.1 --- a/lemon/concepts/graph.h	Tue Aug 06 12:19:11 2013 +0200
     3.2 +++ b/lemon/concepts/graph.h	Wed Aug 07 06:31:47 2013 +0200
     3.3 @@ -382,7 +382,7 @@
     3.4  
     3.5          /// This constructor sets the iterator to the first arc of \c g.
     3.6          ///@param g the graph
     3.7 -        ArcIt(const Graph &g) { ignore_unused_variable_warning(g); }
     3.8 +        ArcIt(const Graph &g) { ::lemon::ignore_unused_variable_warning(g); }
     3.9          /// Arc -> ArcIt conversion
    3.10  
    3.11          /// Sets the iterator to the value of the trivial iterator \c e.
    3.12 @@ -431,8 +431,8 @@
    3.13          ///@param n the node
    3.14          ///@param g the graph
    3.15          OutArcIt(const Graph& n, const Node& g) {
    3.16 -          ignore_unused_variable_warning(n);
    3.17 -          ignore_unused_variable_warning(g);
    3.18 +          ::lemon::ignore_unused_variable_warning(n);
    3.19 +          ::lemon::ignore_unused_variable_warning(g);
    3.20          }
    3.21          /// Arc -> OutArcIt conversion
    3.22  
    3.23 @@ -483,8 +483,8 @@
    3.24          ///@param n the node
    3.25          ///@param g the graph
    3.26          InArcIt(const Graph& g, const Node& n) {
    3.27 -          ignore_unused_variable_warning(n);
    3.28 -          ignore_unused_variable_warning(g);
    3.29 +          ::lemon::ignore_unused_variable_warning(n);
    3.30 +          ::lemon::ignore_unused_variable_warning(g);
    3.31          }
    3.32          /// Arc -> InArcIt conversion
    3.33  
     4.1 --- a/lemon/concepts/graph_components.h	Tue Aug 06 12:19:11 2013 +0200
     4.2 +++ b/lemon/concepts/graph_components.h	Wed Aug 07 06:31:47 2013 +0200
     4.3 @@ -108,7 +108,7 @@
     4.4            i1 = i2 = i3;
     4.5  
     4.6            bool b;
     4.7 -          ignore_unused_variable_warning(b);
     4.8 +          ::lemon::ignore_unused_variable_warning(b);
     4.9  
    4.10            b = (ia == ib) && (ia != ib);
    4.11            b = (ia == INVALID) && (ib != INVALID);
    4.12 @@ -289,7 +289,7 @@
    4.13              e = graph.oppositeArc(e);
    4.14              ue = e;
    4.15              bool d = graph.direction(e);
    4.16 -            ignore_unused_variable_warning(d);
    4.17 +            ::lemon::ignore_unused_variable_warning(d);
    4.18            }
    4.19          }
    4.20  
    4.21 @@ -368,9 +368,9 @@
    4.22            arc = digraph.arcFromId(eid);
    4.23  
    4.24            nid = digraph.maxNodeId();
    4.25 -          ignore_unused_variable_warning(nid);
    4.26 +          ::lemon::ignore_unused_variable_warning(nid);
    4.27            eid = digraph.maxArcId();
    4.28 -          ignore_unused_variable_warning(eid);
    4.29 +          ::lemon::ignore_unused_variable_warning(eid);
    4.30          }
    4.31  
    4.32          const _Digraph& digraph;
    4.33 @@ -423,7 +423,7 @@
    4.34            ueid = graph.id(edge);
    4.35            edge = graph.edgeFromId(ueid);
    4.36            ueid = graph.maxEdgeId();
    4.37 -          ignore_unused_variable_warning(ueid);
    4.38 +          ::lemon::ignore_unused_variable_warning(ueid);
    4.39          }
    4.40  
    4.41          const _Graph& graph;
    4.42 @@ -496,8 +496,8 @@
    4.43            _GraphItemIt it2;
    4.44            _GraphItemIt it3 = it1;
    4.45            _GraphItemIt it4 = INVALID;
    4.46 -          ignore_unused_variable_warning(it3);
    4.47 -          ignore_unused_variable_warning(it4);
    4.48 +          ::lemon::ignore_unused_variable_warning(it3);
    4.49 +          ::lemon::ignore_unused_variable_warning(it4);
    4.50  
    4.51            it2 = ++it1;
    4.52            ++it2 = it1;
    4.53 @@ -587,8 +587,8 @@
    4.54            _GraphIncIt it2;
    4.55            _GraphIncIt it3 = it1;
    4.56            _GraphIncIt it4 = INVALID;
    4.57 -          ignore_unused_variable_warning(it3);
    4.58 -          ignore_unused_variable_warning(it4);
    4.59 +          ::lemon::ignore_unused_variable_warning(it3);
    4.60 +          ::lemon::ignore_unused_variable_warning(it4);
    4.61  
    4.62            it2 = ++it1;
    4.63            ++it2 = it1;
    4.64 @@ -770,7 +770,7 @@
    4.65              n = digraph.runningNode(iait);
    4.66              n = digraph.baseNode(oait);
    4.67              n = digraph.runningNode(oait);
    4.68 -            ignore_unused_variable_warning(n);
    4.69 +            ::lemon::ignore_unused_variable_warning(n);
    4.70            }
    4.71          }
    4.72  
    4.73 @@ -953,8 +953,8 @@
    4.74            typename _Digraph::ArcNotifier& en
    4.75              = digraph.notifier(typename _Digraph::Arc());
    4.76  
    4.77 -          ignore_unused_variable_warning(nn);
    4.78 -          ignore_unused_variable_warning(en);
    4.79 +          ::lemon::ignore_unused_variable_warning(nn);
    4.80 +          ::lemon::ignore_unused_variable_warning(en);
    4.81          }
    4.82  
    4.83          const _Digraph& digraph;
    4.84 @@ -996,7 +996,7 @@
    4.85            checkConcept<AlterableDigraphComponent<Base>, _Graph>();
    4.86            typename _Graph::EdgeNotifier& uen
    4.87              = graph.notifier(typename _Graph::Edge());
    4.88 -          ignore_unused_variable_warning(uen);
    4.89 +          ::lemon::ignore_unused_variable_warning(uen);
    4.90          }
    4.91  
    4.92          const _Graph& graph;
    4.93 @@ -1070,9 +1070,9 @@
    4.94            // ReadMap<Key, Value> cmap;
    4.95            // m3 = cmap;
    4.96  
    4.97 -          ignore_unused_variable_warning(m1);
    4.98 -          ignore_unused_variable_warning(m2);
    4.99 -          // ignore_unused_variable_warning(m3);
   4.100 +          ::lemon::ignore_unused_variable_warning(m1);
   4.101 +          ::lemon::ignore_unused_variable_warning(m2);
   4.102 +          // ::lemon::ignore_unused_variable_warning(m3);
   4.103          }
   4.104  
   4.105          const _Map &m;
     5.1 --- a/lemon/concepts/heap.h	Tue Aug 06 12:19:11 2013 +0200
     5.2 +++ b/lemon/concepts/heap.h	Wed Aug 07 06:31:47 2013 +0200
     5.3 @@ -198,27 +198,27 @@
     5.4            Prio prio;
     5.5            item=Item();
     5.6            prio=Prio();
     5.7 -          ignore_unused_variable_warning(item);
     5.8 -          ignore_unused_variable_warning(prio);
     5.9 +          ::lemon::ignore_unused_variable_warning(item);
    5.10 +          ::lemon::ignore_unused_variable_warning(prio);
    5.11  
    5.12            OwnItem own_item;
    5.13            OwnPrio own_prio;
    5.14            OwnState own_state;
    5.15            own_item=Item();
    5.16            own_prio=Prio();
    5.17 -          ignore_unused_variable_warning(own_item);
    5.18 -          ignore_unused_variable_warning(own_prio);
    5.19 -          ignore_unused_variable_warning(own_state);
    5.20 +          ::lemon::ignore_unused_variable_warning(own_item);
    5.21 +          ::lemon::ignore_unused_variable_warning(own_prio);
    5.22 +          ::lemon::ignore_unused_variable_warning(own_state);
    5.23  
    5.24            _Heap heap1(map);
    5.25            _Heap heap2 = heap1;
    5.26 -          ignore_unused_variable_warning(heap1);
    5.27 -          ignore_unused_variable_warning(heap2);
    5.28 +          ::lemon::ignore_unused_variable_warning(heap1);
    5.29 +          ::lemon::ignore_unused_variable_warning(heap2);
    5.30  
    5.31            int s = heap.size();
    5.32 -          ignore_unused_variable_warning(s);
    5.33 +          ::lemon::ignore_unused_variable_warning(s);
    5.34            bool e = heap.empty();
    5.35 -          ignore_unused_variable_warning(e);
    5.36 +          ::lemon::ignore_unused_variable_warning(e);
    5.37  
    5.38            prio = heap.prio();
    5.39            item = heap.top();
     6.1 --- a/lemon/concepts/maps.h	Tue Aug 06 12:19:11 2013 +0200
     6.2 +++ b/lemon/concepts/maps.h	Wed Aug 07 06:31:47 2013 +0200
     6.3 @@ -60,10 +60,10 @@
     6.4            typename _ReadMap::Value own_val = m[own_key];
     6.5            own_val = m[own_key];
     6.6  
     6.7 -          ignore_unused_variable_warning(key);
     6.8 -          ignore_unused_variable_warning(val);
     6.9 -          ignore_unused_variable_warning(own_key);
    6.10 -          ignore_unused_variable_warning(own_val);
    6.11 +          ::lemon::ignore_unused_variable_warning(key);
    6.12 +          ::lemon::ignore_unused_variable_warning(val);
    6.13 +          ::lemon::ignore_unused_variable_warning(own_key);
    6.14 +          ::lemon::ignore_unused_variable_warning(own_val);
    6.15          }
    6.16          const Key& key;
    6.17          const typename _ReadMap::Key& own_key;
    6.18 @@ -100,10 +100,10 @@
    6.19            m.set(key, val);
    6.20            m.set(own_key, own_val);
    6.21  
    6.22 -          ignore_unused_variable_warning(key);
    6.23 -          ignore_unused_variable_warning(val);
    6.24 -          ignore_unused_variable_warning(own_key);
    6.25 -          ignore_unused_variable_warning(own_val);
    6.26 +          ::lemon::ignore_unused_variable_warning(key);
    6.27 +          ::lemon::ignore_unused_variable_warning(val);
    6.28 +          ::lemon::ignore_unused_variable_warning(own_key);
    6.29 +          ::lemon::ignore_unused_variable_warning(own_val);
    6.30          }
    6.31          const Key& key;
    6.32          const Value& val;
     7.1 --- a/lemon/concepts/path.h	Tue Aug 06 12:19:11 2013 +0200
     7.2 +++ b/lemon/concepts/path.h	Wed Aug 07 06:31:47 2013 +0200
     7.3 @@ -66,7 +66,7 @@
     7.4        /// \brief Template assigment
     7.5        template <typename CPath>
     7.6        Path& operator=(const CPath& cpath) {
     7.7 -        ignore_unused_variable_warning(cpath);
     7.8 +        ::lemon::ignore_unused_variable_warning(cpath);
     7.9          return *this;
    7.10        }
    7.11  
    7.12 @@ -126,12 +126,12 @@
    7.13            e = (i != ii);
    7.14            e = (i < ii);
    7.15  
    7.16 -          ignore_unused_variable_warning(l);
    7.17 -          ignore_unused_variable_warning(pp);
    7.18 -          ignore_unused_variable_warning(e);
    7.19 -          ignore_unused_variable_warning(id);
    7.20 -          ignore_unused_variable_warning(ii);
    7.21 -          ignore_unused_variable_warning(ed);
    7.22 +          ::lemon::ignore_unused_variable_warning(l);
    7.23 +          ::lemon::ignore_unused_variable_warning(pp);
    7.24 +          ::lemon::ignore_unused_variable_warning(e);
    7.25 +          ::lemon::ignore_unused_variable_warning(id);
    7.26 +          ::lemon::ignore_unused_variable_warning(ii);
    7.27 +          ::lemon::ignore_unused_variable_warning(ed);
    7.28          }
    7.29        };
    7.30  
    7.31 @@ -153,10 +153,10 @@
    7.32            e = (i == INVALID);
    7.33            e = (i != INVALID);
    7.34  
    7.35 -          ignore_unused_variable_warning(l);
    7.36 -          ignore_unused_variable_warning(e);
    7.37 -          ignore_unused_variable_warning(id);
    7.38 -          ignore_unused_variable_warning(ed);
    7.39 +          ::lemon::ignore_unused_variable_warning(l);
    7.40 +          ::lemon::ignore_unused_variable_warning(e);
    7.41 +          ::lemon::ignore_unused_variable_warning(id);
    7.42 +          ::lemon::ignore_unused_variable_warning(ed);
    7.43          }
    7.44          _Path& p;
    7.45          PathDumperConstraints() {}
    7.46 @@ -179,10 +179,10 @@
    7.47            e = (i == INVALID);
    7.48            e = (i != INVALID);
    7.49  
    7.50 -          ignore_unused_variable_warning(l);
    7.51 -          ignore_unused_variable_warning(e);
    7.52 -          ignore_unused_variable_warning(id);
    7.53 -          ignore_unused_variable_warning(ed);
    7.54 +          ::lemon::ignore_unused_variable_warning(l);
    7.55 +          ::lemon::ignore_unused_variable_warning(e);
    7.56 +          ::lemon::ignore_unused_variable_warning(id);
    7.57 +          ::lemon::ignore_unused_variable_warning(ed);
    7.58          }
    7.59          _Path& p;
    7.60          PathDumperConstraints() {}
     8.1 --- a/test/adaptors_test.cc	Tue Aug 06 12:19:11 2013 +0200
     8.2 +++ b/test/adaptors_test.cc	Wed Aug 07 06:31:47 2013 +0200
     8.3 @@ -65,7 +65,7 @@
     8.4    Digraph::Arc a1 = digraph.addArc(n1, n2);
     8.5    Digraph::Arc a2 = digraph.addArc(n1, n3);
     8.6    Digraph::Arc a3 = digraph.addArc(n2, n3);
     8.7 -  ignore_unused_variable_warning(a3);
     8.8 +  ::lemon::ignore_unused_variable_warning(a3);
     8.9  
    8.10    // Check the adaptor
    8.11    checkGraphNodeList(adaptor, 3);
    8.12 @@ -100,7 +100,7 @@
    8.13    Adaptor::Arc a6 = adaptor.addArc(n2, n4);
    8.14    Adaptor::Arc a7 = adaptor.addArc(n1, n4);
    8.15    Adaptor::Arc a8 = adaptor.addArc(n1, n2);
    8.16 -  ignore_unused_variable_warning(a6,a7,a8);
    8.17 +  ::lemon::ignore_unused_variable_warning(a6,a7,a8);
    8.18  
    8.19    adaptor.erase(a1);
    8.20    adaptor.erase(n3);
    8.21 @@ -760,7 +760,7 @@
    8.22    Digraph::Arc a1 = digraph.addArc(n1, n2);
    8.23    Digraph::Arc a2 = digraph.addArc(n1, n3);
    8.24    Digraph::Arc a3 = digraph.addArc(n2, n3);
    8.25 -  ignore_unused_variable_warning(a1,a2,a3);
    8.26 +  ::lemon::ignore_unused_variable_warning(a1,a2,a3);
    8.27  
    8.28    checkGraphNodeList(adaptor, 6);
    8.29    checkGraphArcList(adaptor, 6);
     9.1 --- a/test/bfs_test.cc	Tue Aug 06 12:19:11 2013 +0200
     9.2 +++ b/test/bfs_test.cc	Wed Aug 07 06:31:47 2013 +0200
     9.3 @@ -61,7 +61,7 @@
     9.4    Node s, t, n;
     9.5    Arc e;
     9.6    int l, i;
     9.7 -  ignore_unused_variable_warning(l,i);
     9.8 +  ::lemon::ignore_unused_variable_warning(l,i);
     9.9    bool b;
    9.10    BType::DistMap d(G);
    9.11    BType::PredMap p(G);
    9.12 @@ -151,7 +151,7 @@
    9.13  
    9.14    Digraph g;
    9.15    bool b;
    9.16 -  ignore_unused_variable_warning(b);
    9.17 +  ::lemon::ignore_unused_variable_warning(b);
    9.18  
    9.19    bfs(g).run(Node());
    9.20    b=bfs(g).run(Node(),Node());
    10.1 --- a/test/circulation_test.cc	Tue Aug 06 12:19:11 2013 +0200
    10.2 +++ b/test/circulation_test.cc	Wed Aug 07 06:31:47 2013 +0200
    10.3 @@ -73,7 +73,7 @@
    10.4    BarrierMap bar;
    10.5    VType v;
    10.6    bool b;
    10.7 -  ignore_unused_variable_warning(v,b);
    10.8 +  ::lemon::ignore_unused_variable_warning(v,b);
    10.9  
   10.10    typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
   10.11              ::SetFlowMap<FlowMap>
   10.12 @@ -99,7 +99,7 @@
   10.13    b = const_circ_test.barrier(n);
   10.14    const_circ_test.barrierMap(bar);
   10.15  
   10.16 -  ignore_unused_variable_warning(fm);
   10.17 +  ::lemon::ignore_unused_variable_warning(fm);
   10.18  }
   10.19  
   10.20  template <class G, class LM, class UM, class DM>
    11.1 --- a/test/connectivity_test.cc	Tue Aug 06 12:19:11 2013 +0200
    11.2 +++ b/test/connectivity_test.cc	Wed Aug 07 06:31:47 2013 +0200
    11.3 @@ -68,7 +68,7 @@
    11.4      Digraph::NodeMap<int> order(d);
    11.5      Graph g(d);
    11.6      Digraph::Node n = d.addNode();
    11.7 -    ignore_unused_variable_warning(n);
    11.8 +    ::lemon::ignore_unused_variable_warning(n);
    11.9  
   11.10      check(stronglyConnected(d), "This digraph is strongly connected");
   11.11      check(countStronglyConnectedComponents(d) == 1,
   11.12 @@ -246,7 +246,7 @@
   11.13      Digraph::Node shoe = d.addNode();
   11.14      Digraph::Node watch = d.addNode();
   11.15      Digraph::Node pants = d.addNode();
   11.16 -    ignore_unused_variable_warning(watch);
   11.17 +    ::lemon::ignore_unused_variable_warning(watch);
   11.18  
   11.19      d.addArc(socks, shoe);
   11.20      d.addArc(pants, shoe);
    12.1 --- a/test/dfs_test.cc	Tue Aug 06 12:19:11 2013 +0200
    12.2 +++ b/test/dfs_test.cc	Wed Aug 07 06:31:47 2013 +0200
    12.3 @@ -67,7 +67,7 @@
    12.4    Arc e;
    12.5    int l, i;
    12.6    bool b;
    12.7 -  ignore_unused_variable_warning(l,i,b);
    12.8 +  ::lemon::ignore_unused_variable_warning(l,i,b);
    12.9  
   12.10    DType::DistMap d(G);
   12.11    DType::PredMap p(G);
   12.12 @@ -153,7 +153,7 @@
   12.13  
   12.14    Digraph g;
   12.15    bool b;
   12.16 -  ignore_unused_variable_warning(b);
   12.17 +  ::lemon::ignore_unused_variable_warning(b);
   12.18  
   12.19    dfs(g).run(Node());
   12.20    b=dfs(g).run(Node(),Node());
    13.1 --- a/test/digraph_test.cc	Tue Aug 06 12:19:11 2013 +0200
    13.2 +++ b/test/digraph_test.cc	Wed Aug 07 06:31:47 2013 +0200
    13.3 @@ -60,7 +60,7 @@
    13.4    Arc a2 = G.addArc(n2, n1),
    13.5        a3 = G.addArc(n2, n3),
    13.6        a4 = G.addArc(n2, n3);
    13.7 -  ignore_unused_variable_warning(a2,a3,a4);
    13.8 +  ::lemon::ignore_unused_variable_warning(a2,a3,a4);
    13.9  
   13.10    checkGraphNodeList(G, 3);
   13.11    checkGraphArcList(G, 4);
   13.12 @@ -89,7 +89,7 @@
   13.13    Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
   13.14    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n2, n1),
   13.15        a3 = G.addArc(n2, n3), a4 = G.addArc(n2, n3);
   13.16 -  ignore_unused_variable_warning(a1,a2,a3,a4);
   13.17 +  ::lemon::ignore_unused_variable_warning(a1,a2,a3,a4);
   13.18  
   13.19    Node n4 = G.split(n2);
   13.20  
   13.21 @@ -123,7 +123,7 @@
   13.22    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n4, n1),
   13.23        a3 = G.addArc(n4, n3), a4 = G.addArc(n4, n3),
   13.24        a5 = G.addArc(n2, n4);
   13.25 -  ignore_unused_variable_warning(a1,a2,a3,a5);
   13.26 +  ::lemon::ignore_unused_variable_warning(a1,a2,a3,a5);
   13.27  
   13.28    checkGraphNodeList(G, 4);
   13.29    checkGraphArcList(G, 5);
   13.30 @@ -203,7 +203,7 @@
   13.31    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n4, n1),
   13.32        a3 = G.addArc(n4, n3), a4 = G.addArc(n3, n1),
   13.33        a5 = G.addArc(n2, n4);
   13.34 -  ignore_unused_variable_warning(a2,a3,a4,a5);
   13.35 +  ::lemon::ignore_unused_variable_warning(a2,a3,a4,a5);
   13.36  
   13.37    // Check arc deletion
   13.38    G.erase(a1);
   13.39 @@ -251,7 +251,7 @@
   13.40    Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
   13.41    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n2, n1),
   13.42        a3 = G.addArc(n2, n3), a4 = G.addArc(n2, n3);
   13.43 -  ignore_unused_variable_warning(a1,a2,a3,a4);
   13.44 +  ::lemon::ignore_unused_variable_warning(a1,a2,a3,a4);
   13.45  
   13.46    typename Digraph::Snapshot snapshot(G);
   13.47  
   13.48 @@ -340,7 +340,7 @@
   13.49    Arc
   13.50      e1 = g.addArc(n1, n2),
   13.51      e2 = g.addArc(n2, n3);
   13.52 -  ignore_unused_variable_warning(e2);
   13.53 +  ::lemon::ignore_unused_variable_warning(e2);
   13.54  
   13.55    check(g.valid(n1), "Wrong validity check");
   13.56    check(g.valid(e1), "Wrong validity check");
    14.1 --- a/test/dijkstra_test.cc	Tue Aug 06 12:19:11 2013 +0200
    14.2 +++ b/test/dijkstra_test.cc	Wed Aug 07 06:31:47 2013 +0200
    14.3 @@ -65,7 +65,7 @@
    14.4    VType l;
    14.5    int i;
    14.6    bool b;
    14.7 -  ignore_unused_variable_warning(l,i,b);
    14.8 +  ::lemon::ignore_unused_variable_warning(l,i,b);
    14.9  
   14.10    DType::DistMap d(G);
   14.11    DType::PredMap p(G);
   14.12 @@ -164,7 +164,7 @@
   14.13  
   14.14    Digraph g;
   14.15    bool b;
   14.16 -  ignore_unused_variable_warning(b);
   14.17 +  ::lemon::ignore_unused_variable_warning(b);
   14.18  
   14.19    dijkstra(g,LengthMap()).run(Node());
   14.20    b=dijkstra(g,LengthMap()).run(Node(),Node());
    15.1 --- a/test/edge_set_test.cc	Tue Aug 06 12:19:11 2013 +0200
    15.2 +++ b/test/edge_set_test.cc	Wed Aug 07 06:31:47 2013 +0200
    15.3 @@ -44,12 +44,12 @@
    15.4      n2 = digraph.addNode();
    15.5  
    15.6    Digraph::Arc ga1 = digraph.addArc(n1, n2);
    15.7 -  ignore_unused_variable_warning(ga1);
    15.8 +  ::lemon::ignore_unused_variable_warning(ga1);
    15.9  
   15.10    ArcSet arc_set(digraph);
   15.11  
   15.12    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   15.13 -  ignore_unused_variable_warning(ga2);
   15.14 +  ::lemon::ignore_unused_variable_warning(ga2);
   15.15  
   15.16    checkGraphNodeList(arc_set, 2);
   15.17    checkGraphArcList(arc_set, 0);
   15.18 @@ -77,7 +77,7 @@
   15.19    ArcSet::Arc a2 = arc_set.addArc(n2, n1),
   15.20      a3 = arc_set.addArc(n2, n3),
   15.21      a4 = arc_set.addArc(n2, n3);
   15.22 -  ignore_unused_variable_warning(a2,a3,a4);
   15.23 +  ::lemon::ignore_unused_variable_warning(a2,a3,a4);
   15.24  
   15.25    checkGraphNodeList(arc_set, 3);
   15.26    checkGraphArcList(arc_set, 4);
   15.27 @@ -114,12 +114,12 @@
   15.28      n2 = digraph.addNode();
   15.29  
   15.30    Digraph::Arc ga1 = digraph.addArc(n1, n2);
   15.31 -  ignore_unused_variable_warning(ga1);
   15.32 +  ::lemon::ignore_unused_variable_warning(ga1);
   15.33  
   15.34    ArcSet arc_set(digraph);
   15.35  
   15.36    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   15.37 -  ignore_unused_variable_warning(ga2);
   15.38 +  ::lemon::ignore_unused_variable_warning(ga2);
   15.39  
   15.40    checkGraphNodeList(arc_set, 2);
   15.41    checkGraphArcList(arc_set, 0);
   15.42 @@ -147,7 +147,7 @@
   15.43    ArcSet::Arc a2 = arc_set.addArc(n2, n1),
   15.44      a3 = arc_set.addArc(n2, n3),
   15.45      a4 = arc_set.addArc(n2, n3);
   15.46 -  ignore_unused_variable_warning(a2,a3,a4);
   15.47 +  ::lemon::ignore_unused_variable_warning(a2,a3,a4);
   15.48  
   15.49    checkGraphNodeList(arc_set, 3);
   15.50    checkGraphArcList(arc_set, 4);
   15.51 @@ -198,12 +198,12 @@
   15.52      n2 = digraph.addNode();
   15.53  
   15.54    Digraph::Arc ga1 = digraph.addArc(n1, n2);
   15.55 -  ignore_unused_variable_warning(ga1);
   15.56 +  ::lemon::ignore_unused_variable_warning(ga1);
   15.57  
   15.58    EdgeSet edge_set(digraph);
   15.59  
   15.60    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   15.61 -  ignore_unused_variable_warning(ga2);
   15.62 +  ::lemon::ignore_unused_variable_warning(ga2);
   15.63  
   15.64    checkGraphNodeList(edge_set, 2);
   15.65    checkGraphArcList(edge_set, 0);
   15.66 @@ -240,7 +240,7 @@
   15.67    EdgeSet::Edge e2 = edge_set.addEdge(n2, n1),
   15.68      e3 = edge_set.addEdge(n2, n3),
   15.69      e4 = edge_set.addEdge(n2, n3);
   15.70 -  ignore_unused_variable_warning(e2,e3,e4);
   15.71 +  ::lemon::ignore_unused_variable_warning(e2,e3,e4);
   15.72  
   15.73    checkGraphNodeList(edge_set, 3);
   15.74    checkGraphEdgeList(edge_set, 4);
   15.75 @@ -286,12 +286,12 @@
   15.76      n2 = digraph.addNode();
   15.77  
   15.78    Digraph::Arc ga1 = digraph.addArc(n1, n2);
   15.79 -  ignore_unused_variable_warning(ga1);
   15.80 +  ::lemon::ignore_unused_variable_warning(ga1);
   15.81  
   15.82    EdgeSet edge_set(digraph);
   15.83  
   15.84    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   15.85 -  ignore_unused_variable_warning(ga2);
   15.86 +  ::lemon::ignore_unused_variable_warning(ga2);
   15.87  
   15.88    checkGraphNodeList(edge_set, 2);
   15.89    checkGraphArcList(edge_set, 0);
   15.90 @@ -328,7 +328,7 @@
   15.91    EdgeSet::Edge e2 = edge_set.addEdge(n2, n1),
   15.92      e3 = edge_set.addEdge(n2, n3),
   15.93      e4 = edge_set.addEdge(n2, n3);
   15.94 -  ignore_unused_variable_warning(e2,e3,e4);
   15.95 +  ::lemon::ignore_unused_variable_warning(e2,e3,e4);
   15.96  
   15.97    checkGraphNodeList(edge_set, 3);
   15.98    checkGraphEdgeList(edge_set, 4);
    16.1 --- a/test/euler_test.cc	Tue Aug 06 12:19:11 2013 +0200
    16.2 +++ b/test/euler_test.cc	Wed Aug 07 06:31:47 2013 +0200
    16.3 @@ -101,7 +101,7 @@
    16.4      Digraph d;
    16.5      Graph g(d);
    16.6      Digraph::Node n = d.addNode();
    16.7 -    ignore_unused_variable_warning(n);
    16.8 +    ::lemon::ignore_unused_variable_warning(n);
    16.9    
   16.10      checkDiEulerIt(d);
   16.11      checkDiEulerIt(g);
   16.12 @@ -190,7 +190,7 @@
   16.13      Digraph::Node n3 = d.addNode();
   16.14      Digraph::Node n4 = d.addNode();
   16.15      Digraph::Node n5 = d.addNode();
   16.16 -    ignore_unused_variable_warning(n0,n4,n5);
   16.17 +    ::lemon::ignore_unused_variable_warning(n0,n4,n5);
   16.18  
   16.19      d.addArc(n1, n2);
   16.20      d.addArc(n2, n3);
    17.1 --- a/test/gomory_hu_test.cc	Tue Aug 06 12:19:11 2013 +0200
    17.2 +++ b/test/gomory_hu_test.cc	Wed Aug 07 06:31:47 2013 +0200
    17.3 @@ -68,7 +68,7 @@
    17.4    CutMap cut;
    17.5    Value v;
    17.6    int d;
    17.7 -  ignore_unused_variable_warning(v,d);
    17.8 +  ::lemon::ignore_unused_variable_warning(v,d);
    17.9  
   17.10    GomoryHu<Graph, CapMap> gh_test(g, cap);
   17.11    const GomoryHu<Graph, CapMap>&
    18.1 --- a/test/graph_test.cc	Tue Aug 06 12:19:11 2013 +0200
    18.2 +++ b/test/graph_test.cc	Wed Aug 07 06:31:47 2013 +0200
    18.3 @@ -63,7 +63,7 @@
    18.4  
    18.5    Edge e2 = G.addEdge(n2, n1),
    18.6         e3 = G.addEdge(n2, n3);
    18.7 -  ignore_unused_variable_warning(e2,e3);
    18.8 +  ::lemon::ignore_unused_variable_warning(e2,e3);
    18.9  
   18.10    checkGraphNodeList(G, 3);
   18.11    checkGraphEdgeList(G, 3);
   18.12 @@ -96,7 +96,7 @@
   18.13    Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
   18.14         e3 = G.addEdge(n2, n3), e4 = G.addEdge(n1, n4),
   18.15         e5 = G.addEdge(n4, n3);
   18.16 -  ignore_unused_variable_warning(e1,e3,e4,e5);
   18.17 +  ::lemon::ignore_unused_variable_warning(e1,e3,e4,e5);
   18.18  
   18.19    checkGraphNodeList(G, 4);
   18.20    checkGraphEdgeList(G, 5);
   18.21 @@ -176,7 +176,7 @@
   18.22    Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
   18.23         e3 = G.addEdge(n2, n3), e4 = G.addEdge(n1, n4),
   18.24         e5 = G.addEdge(n4, n3);
   18.25 -  ignore_unused_variable_warning(e1,e3,e4,e5);
   18.26 +  ::lemon::ignore_unused_variable_warning(e1,e3,e4,e5);
   18.27  
   18.28    // Check edge deletion
   18.29    G.erase(e2);
   18.30 @@ -217,7 +217,7 @@
   18.31    Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
   18.32    Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
   18.33         e3 = G.addEdge(n2, n3);
   18.34 -  ignore_unused_variable_warning(e1,e2,e3);
   18.35 +  ::lemon::ignore_unused_variable_warning(e1,e2,e3);
   18.36  
   18.37    checkGraphNodeList(G, 3);
   18.38    checkGraphEdgeList(G, 3);
   18.39 @@ -366,7 +366,7 @@
   18.40    Edge
   18.41      e1 = g.addEdge(n1, n2),
   18.42      e2 = g.addEdge(n2, n3);
   18.43 -  ignore_unused_variable_warning(e2);
   18.44 +  ::lemon::ignore_unused_variable_warning(e2);
   18.45  
   18.46    check(g.valid(n1), "Wrong validity check");
   18.47    check(g.valid(e1), "Wrong validity check");
   18.48 @@ -496,7 +496,7 @@
   18.49    checkGraphArcList(G, dim * (1 << dim));
   18.50  
   18.51    Node n = G.nodeFromId(dim);
   18.52 -  ignore_unused_variable_warning(n);
   18.53 +  ::lemon::ignore_unused_variable_warning(n);
   18.54  
   18.55    for (NodeIt n(G); n != INVALID; ++n) {
   18.56      checkGraphIncEdgeList(G, n, dim);
    19.1 --- a/test/hao_orlin_test.cc	Tue Aug 06 12:19:11 2013 +0200
    19.2 +++ b/test/hao_orlin_test.cc	Wed Aug 07 06:31:47 2013 +0200
    19.3 @@ -66,7 +66,7 @@
    19.4    CapMap cap;
    19.5    CutMap cut;
    19.6    Value v;
    19.7 -  ignore_unused_variable_warning(v);
    19.8 +  ::lemon::ignore_unused_variable_warning(v);
    19.9  
   19.10    HaoOrlin<Digraph, CapMap> ho_test(g, cap);
   19.11    const HaoOrlin<Digraph, CapMap>&
    20.1 --- a/test/maps_test.cc	Tue Aug 06 12:19:11 2013 +0200
    20.2 +++ b/test/maps_test.cc	Wed Aug 07 06:31:47 2013 +0200
    20.3 @@ -80,7 +80,7 @@
    20.4      checkConcept<ReadWriteMap<A,B>, NullMap<A,B> >();
    20.5      NullMap<A,B> map1;
    20.6      NullMap<A,B> map2 = map1;
    20.7 -    ignore_unused_variable_warning(map2);
    20.8 +    ::lemon::ignore_unused_variable_warning(map2);
    20.9      map1 = nullMap<A,B>();
   20.10    }
   20.11  
   20.12 @@ -91,14 +91,14 @@
   20.13      ConstMap<A,B> map1;
   20.14      ConstMap<A,B> map2 = B();
   20.15      ConstMap<A,B> map3 = map1;
   20.16 -    ignore_unused_variable_warning(map2,map3);
   20.17 +    ::lemon::ignore_unused_variable_warning(map2,map3);
   20.18  
   20.19      map1 = constMap<A>(B());
   20.20      map1 = constMap<A,B>();
   20.21      map1.setAll(B());
   20.22      ConstMap<A,C> map4(C(1));
   20.23      ConstMap<A,C> map5 = map4;
   20.24 -    ignore_unused_variable_warning(map5);
   20.25 +    ::lemon::ignore_unused_variable_warning(map5);
   20.26  
   20.27      map4 = constMap<A>(C(2));
   20.28      map4.setAll(C(3));
   20.29 @@ -120,7 +120,7 @@
   20.30      checkConcept<ReadMap<A,A>, IdentityMap<A> >();
   20.31      IdentityMap<A> map1;
   20.32      IdentityMap<A> map2 = map1;
   20.33 -    ignore_unused_variable_warning(map2);
   20.34 +    ::lemon::ignore_unused_variable_warning(map2);
   20.35  
   20.36      map1 = identityMap<A>();
   20.37  
   20.38 @@ -181,9 +181,9 @@
   20.39      typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
   20.40      checkConcept<ReadMap<B,double>, CompMap>();
   20.41      CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>());
   20.42 -    ignore_unused_variable_warning(map1);
   20.43 +    ::lemon::ignore_unused_variable_warning(map1);
   20.44      CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
   20.45 -    ignore_unused_variable_warning(map2);
   20.46 +    ::lemon::ignore_unused_variable_warning(map2);
   20.47  
   20.48      SparseMap<double, bool> m1(false); m1[3.14] = true;
   20.49      RangeMap<double> m2(2); m2[0] = 3.0; m2[1] = 3.14;
   20.50 @@ -196,9 +196,9 @@
   20.51      typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
   20.52      checkConcept<ReadMap<A,double>, CombMap>();
   20.53      CombMap map1 = CombMap(DoubleMap(), DoubleMap());
   20.54 -    ignore_unused_variable_warning(map1);
   20.55 +    ::lemon::ignore_unused_variable_warning(map1);
   20.56      CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
   20.57 -    ignore_unused_variable_warning(map2);
   20.58 +    ::lemon::ignore_unused_variable_warning(map2);
   20.59  
   20.60      check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
   20.61            "Something is wrong with CombineMap");
   20.62 @@ -210,15 +210,15 @@
   20.63      checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
   20.64      FunctorToMap<F> map1;
   20.65      FunctorToMap<F> map2 = FunctorToMap<F>(F());
   20.66 -    ignore_unused_variable_warning(map2);
   20.67 +    ::lemon::ignore_unused_variable_warning(map2);
   20.68  
   20.69      B b = functorToMap(F())[A()];
   20.70 -    ignore_unused_variable_warning(b);
   20.71 +    ::lemon::ignore_unused_variable_warning(b);
   20.72  
   20.73      checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
   20.74      MapToFunctor<ReadMap<A,B> > map =
   20.75        MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
   20.76 -    ignore_unused_variable_warning(map);
   20.77 +    ::lemon::ignore_unused_variable_warning(map);
   20.78  
   20.79      check(functorToMap(&func)[A()] == 3,
   20.80            "Something is wrong with FunctorToMap");
   20.81 @@ -236,9 +236,9 @@
   20.82      checkConcept<ReadMap<double,double>,
   20.83        ConvertMap<ReadMap<double, int>, double> >();
   20.84      ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true));
   20.85 -    ignore_unused_variable_warning(map1);
   20.86 +    ::lemon::ignore_unused_variable_warning(map1);
   20.87      ConvertMap<RangeMap<bool>, int> map2 = convertMap<int>(rangeMap(2, false));
   20.88 -    ignore_unused_variable_warning(map2);
   20.89 +    ::lemon::ignore_unused_variable_warning(map2);
   20.90  
   20.91    }
   20.92  
    21.1 --- a/test/matching_test.cc	Tue Aug 06 12:19:11 2013 +0200
    21.2 +++ b/test/matching_test.cc	Wed Aug 07 06:31:47 2013 +0200
    21.3 @@ -145,7 +145,7 @@
    21.4  
    21.5    MaxMatching<Graph>::Status stat =
    21.6      const_mat_test.status(n);
    21.7 -  ignore_unused_variable_warning(stat);
    21.8 +  ::lemon::ignore_unused_variable_warning(stat);
    21.9    const MaxMatching<Graph>::StatusMap& smap =
   21.10      const_mat_test.statusMap();
   21.11    stat = smap[n];
    22.1 --- a/test/min_cost_arborescence_test.cc	Tue Aug 06 12:19:11 2013 +0200
    22.2 +++ b/test/min_cost_arborescence_test.cc	Wed Aug 07 06:31:47 2013 +0200
    22.3 @@ -91,7 +91,7 @@
    22.4    Arc e;
    22.5    VType c;
    22.6    bool b;
    22.7 -  ignore_unused_variable_warning(c,b);
    22.8 +  ::lemon::ignore_unused_variable_warning(c,b);
    22.9    int i;
   22.10    CostMap cost;
   22.11    ArbMap arb;
   22.12 @@ -127,8 +127,8 @@
   22.13    i = const_mcarb_test.dualSize(i);
   22.14    c = const_mcarb_test.dualValue(i);
   22.15  
   22.16 -  ignore_unused_variable_warning(am);
   22.17 -  ignore_unused_variable_warning(pm);
   22.18 +  ::lemon::ignore_unused_variable_warning(am);
   22.19 +  ::lemon::ignore_unused_variable_warning(pm);
   22.20  }
   22.21  
   22.22  int main() {
    23.1 --- a/test/preflow_test.cc	Tue Aug 06 12:19:11 2013 +0200
    23.2 +++ b/test/preflow_test.cc	Wed Aug 07 06:31:47 2013 +0200
    23.3 @@ -86,7 +86,7 @@
    23.4    CutMap cut;
    23.5    VType v;
    23.6    bool b;
    23.7 -  ignore_unused_variable_warning(v,b);
    23.8 +  ::lemon::ignore_unused_variable_warning(v,b);
    23.9  
   23.10    typedef Preflow<Digraph, CapMap>
   23.11              ::SetFlowMap<FlowMap>
   23.12 @@ -115,7 +115,7 @@
   23.13    b = const_preflow_test.minCut(n);
   23.14    const_preflow_test.minCutMap(cut);
   23.15  
   23.16 -  ignore_unused_variable_warning(fm);
   23.17 +  ::lemon::ignore_unused_variable_warning(fm);
   23.18  }
   23.19  
   23.20  int cutValue (const SmartDigraph& g,
    24.1 --- a/test/suurballe_test.cc	Tue Aug 06 12:19:11 2013 +0200
    24.2 +++ b/test/suurballe_test.cc	Wed Aug 07 06:31:47 2013 +0200
    24.3 @@ -107,7 +107,7 @@
    24.4  
    24.5    int f;
    24.6    VType c;
    24.7 -  ignore_unused_variable_warning(f,c);
    24.8 +  ::lemon::ignore_unused_variable_warning(f,c);
    24.9  
   24.10    c = const_suurb_test.totalLength();
   24.11    f = const_suurb_test.flow(e);
   24.12 @@ -119,8 +119,8 @@
   24.13    k = const_suurb_test.pathNum();
   24.14    Path<Digraph> p = const_suurb_test.path(k);
   24.15  
   24.16 -  ignore_unused_variable_warning(fm);
   24.17 -  ignore_unused_variable_warning(pm);
   24.18 +  ::lemon::ignore_unused_variable_warning(fm);
   24.19 +  ::lemon::ignore_unused_variable_warning(pm);
   24.20  }
   24.21  
   24.22  // Check the feasibility of the flow
    25.1 --- a/test/time_measure_test.cc	Tue Aug 06 12:19:11 2013 +0200
    25.2 +++ b/test/time_measure_test.cc	Wed Aug 07 06:31:47 2013 +0200
    25.3 @@ -35,7 +35,7 @@
    25.4    for(int i=0;i<1000;i++)
    25.5      {
    25.6        TimeStamp x(T);
    25.7 -      ignore_unused_variable_warning(x);
    25.8 +      ::lemon::ignore_unused_variable_warning(x);
    25.9      }
   25.10  }
   25.11