Merge #294
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 07 Aug 2013 07:04:58 +0200
changeset 108697f1760dcd13
parent 1082 cae19e9eeca4
parent 1085 a337a0dd3f75
child 1087 dd1443e4a34c
Merge #294
lemon/concepts/digraph.h
lemon/concepts/graph.h
lemon/concepts/graph_components.h
lemon/core.h
test/dfs_test.cc
test/maps_test.cc
test/max_flow_test.cc
     1.1 --- a/lemon/concept_check.h	Tue Aug 06 17:58:59 2013 +0200
     1.2 +++ b/lemon/concept_check.h	Wed Aug 07 07:04:58 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 17:58:59 2013 +0200
     2.2 +++ b/lemon/concepts/digraph.h	Wed Aug 07 07:04:58 2013 +0200
     2.3 @@ -312,7 +312,7 @@
     2.4  
     2.5          /// Sets the iterator to the first arc of the given digraph.
     2.6          ///
     2.7 -        explicit ArcIt(const Digraph& g) { ignore_unused_variable_warning(g); }
     2.8 +        explicit ArcIt(const Digraph& g) { ::lemon::ignore_unused_variable_warning(g); }
     2.9          /// Sets the iterator to the given arc.
    2.10  
    2.11          /// Sets the iterator to the given arc of the given digraph.
     3.1 --- a/lemon/concepts/graph.h	Tue Aug 06 17:58:59 2013 +0200
     3.2 +++ b/lemon/concepts/graph.h	Wed Aug 07 07:04:58 2013 +0200
     3.3 @@ -396,7 +396,7 @@
     3.4  
     3.5          /// Sets the iterator to the first arc of the given graph.
     3.6          ///
     3.7 -        explicit ArcIt(const Graph &g) { ignore_unused_variable_warning(g); }
     3.8 +        explicit ArcIt(const Graph &g) { ::lemon::ignore_unused_variable_warning(g); }
     3.9          /// Sets the iterator to the given arc.
    3.10  
    3.11          /// Sets the iterator to the given arc of the given graph.
    3.12 @@ -442,8 +442,8 @@
    3.13          /// Sets the iterator to the first outgoing arc of the given node.
    3.14          ///
    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          /// Sets the iterator to the given arc.
    3.22  
    3.23 @@ -490,8 +490,8 @@
    3.24          /// Sets the iterator to the first incoming arc of the given node.
    3.25          ///
    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          /// Sets the iterator to the given arc.
    3.33  
     4.1 --- a/lemon/concepts/graph_components.h	Tue Aug 06 17:58:59 2013 +0200
     4.2 +++ b/lemon/concepts/graph_components.h	Wed Aug 07 07:04:58 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 @@ -534,9 +534,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 @@ -589,7 +589,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 @@ -726,8 +726,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 @@ -817,8 +817,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 @@ -1000,7 +1000,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 @@ -1277,8 +1277,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 @@ -1325,7 +1325,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 @@ -1461,9 +1461,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 17:58:59 2013 +0200
     5.2 +++ b/lemon/concepts/heap.h	Wed Aug 07 07:04:58 2013 +0200
     5.3 @@ -260,27 +260,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 17:58:59 2013 +0200
     6.2 +++ b/lemon/concepts/maps.h	Wed Aug 07 07:04:58 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 17:58:59 2013 +0200
     7.2 +++ b/lemon/concepts/path.h	Wed Aug 07 07:04:58 2013 +0200
     7.3 @@ -75,7 +75,7 @@
     7.4        /// \brief Template assigment operator
     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 @@ -135,12 +135,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 @@ -162,10 +162,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 @@ -188,10 +188,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 17:58:59 2013 +0200
     8.2 +++ b/test/adaptors_test.cc	Wed Aug 07 07:04:58 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/bellman_ford_test.cc	Tue Aug 06 17:58:59 2013 +0200
     9.2 +++ b/test/bellman_ford_test.cc	Wed Aug 07 07:04:58 2013 +0200
     9.3 @@ -65,10 +65,10 @@
     9.4    Node s, t, n;
     9.5    Arc e;
     9.6    Value l;
     9.7 -  ignore_unused_variable_warning(l);
     9.8 +  ::lemon::ignore_unused_variable_warning(l);
     9.9    int k=3;
    9.10    bool b;
    9.11 -  ignore_unused_variable_warning(b);
    9.12 +  ::lemon::ignore_unused_variable_warning(b);
    9.13    BF::DistMap d(gr);
    9.14    BF::PredMap p(gr);
    9.15    LengthMap length;
    9.16 @@ -149,7 +149,7 @@
    9.17  
    9.18    Digraph g;
    9.19    bool b;
    9.20 -  ignore_unused_variable_warning(b);
    9.21 +  ::lemon::ignore_unused_variable_warning(b);
    9.22  
    9.23    bellmanFord(g,LengthMap()).run(Node());
    9.24    b = bellmanFord(g,LengthMap()).run(Node(),Node());
    10.1 --- a/test/bfs_test.cc	Tue Aug 06 17:58:59 2013 +0200
    10.2 +++ b/test/bfs_test.cc	Wed Aug 07 07:04:58 2013 +0200
    10.3 @@ -61,7 +61,7 @@
    10.4    Node s, t, n;
    10.5    Arc e;
    10.6    int l, i;
    10.7 -  ignore_unused_variable_warning(l,i);
    10.8 +  ::lemon::ignore_unused_variable_warning(l,i);
    10.9    bool b;
   10.10    BType::DistMap d(G);
   10.11    BType::PredMap p(G);
   10.12 @@ -151,7 +151,7 @@
   10.13  
   10.14    Digraph g;
   10.15    bool b;
   10.16 -  ignore_unused_variable_warning(b);
   10.17 +  ::lemon::ignore_unused_variable_warning(b);
   10.18  
   10.19    bfs(g).run(Node());
   10.20    b=bfs(g).run(Node(),Node());
    11.1 --- a/test/circulation_test.cc	Tue Aug 06 17:58:59 2013 +0200
    11.2 +++ b/test/circulation_test.cc	Wed Aug 07 07:04:58 2013 +0200
    11.3 @@ -73,7 +73,7 @@
    11.4    BarrierMap bar;
    11.5    VType v;
    11.6    bool b;
    11.7 -  ignore_unused_variable_warning(v,b);
    11.8 +  ::lemon::ignore_unused_variable_warning(v,b);
    11.9  
   11.10    typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
   11.11              ::SetFlowMap<FlowMap>
   11.12 @@ -104,7 +104,7 @@
   11.13    b = const_circ_test.barrier(n);
   11.14    const_circ_test.barrierMap(bar);
   11.15  
   11.16 -  ignore_unused_variable_warning(fm);
   11.17 +  ::lemon::ignore_unused_variable_warning(fm);
   11.18  }
   11.19  
   11.20  template <class G, class LM, class UM, class DM>
    12.1 --- a/test/connectivity_test.cc	Tue Aug 06 17:58:59 2013 +0200
    12.2 +++ b/test/connectivity_test.cc	Wed Aug 07 07:04:58 2013 +0200
    12.3 @@ -68,7 +68,7 @@
    12.4      Digraph::NodeMap<int> order(d);
    12.5      Graph g(d);
    12.6      Digraph::Node n = d.addNode();
    12.7 -    ignore_unused_variable_warning(n);
    12.8 +    ::lemon::ignore_unused_variable_warning(n);
    12.9  
   12.10      check(stronglyConnected(d), "This digraph is strongly connected");
   12.11      check(countStronglyConnectedComponents(d) == 1,
   12.12 @@ -246,7 +246,7 @@
   12.13      Digraph::Node shoe = d.addNode();
   12.14      Digraph::Node watch = d.addNode();
   12.15      Digraph::Node pants = d.addNode();
   12.16 -    ignore_unused_variable_warning(watch);
   12.17 +    ::lemon::ignore_unused_variable_warning(watch);
   12.18  
   12.19      d.addArc(socks, shoe);
   12.20      d.addArc(pants, shoe);
    13.1 --- a/test/dfs_test.cc	Tue Aug 06 17:58:59 2013 +0200
    13.2 +++ b/test/dfs_test.cc	Wed Aug 07 07:04:58 2013 +0200
    13.3 @@ -67,7 +67,7 @@
    13.4    Arc e;
    13.5    int l, i;
    13.6    bool b;
    13.7 -  ignore_unused_variable_warning(l,i,b);
    13.8 +  ::lemon::ignore_unused_variable_warning(l,i,b);
    13.9  
   13.10    DType::DistMap d(G);
   13.11    DType::PredMap p(G);
   13.12 @@ -153,7 +153,7 @@
   13.13  
   13.14    Digraph g;
   13.15    bool b;
   13.16 -  ignore_unused_variable_warning(b);
   13.17 +  ::lemon::ignore_unused_variable_warning(b);
   13.18  
   13.19    dfs(g).run(Node());
   13.20    b=dfs(g).run(Node(),Node());
    14.1 --- a/test/digraph_test.cc	Tue Aug 06 17:58:59 2013 +0200
    14.2 +++ b/test/digraph_test.cc	Wed Aug 07 07:04:58 2013 +0200
    14.3 @@ -64,7 +64,7 @@
    14.4    Arc a2 = G.addArc(n2, n1),
    14.5        a3 = G.addArc(n2, n3),
    14.6        a4 = G.addArc(n2, n3);
    14.7 -  ignore_unused_variable_warning(a2,a3,a4);
    14.8 +  ::lemon::ignore_unused_variable_warning(a2,a3,a4);
    14.9  
   14.10    checkGraphNodeList(G, 3);
   14.11    checkGraphArcList(G, 4);
   14.12 @@ -93,7 +93,7 @@
   14.13    Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
   14.14    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n2, n1),
   14.15        a3 = G.addArc(n2, n3), a4 = G.addArc(n2, n3);
   14.16 -  ignore_unused_variable_warning(a1,a2,a3,a4);
   14.17 +  ::lemon::ignore_unused_variable_warning(a1,a2,a3,a4);
   14.18  
   14.19    Node n4 = G.split(n2);
   14.20  
   14.21 @@ -127,7 +127,7 @@
   14.22    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n4, n1),
   14.23        a3 = G.addArc(n4, n3), a4 = G.addArc(n4, n3),
   14.24        a5 = G.addArc(n2, n4);
   14.25 -  ignore_unused_variable_warning(a1,a2,a3,a5);
   14.26 +  ::lemon::ignore_unused_variable_warning(a1,a2,a3,a5);
   14.27  
   14.28    checkGraphNodeList(G, 4);
   14.29    checkGraphArcList(G, 5);
   14.30 @@ -207,7 +207,7 @@
   14.31    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n4, n1),
   14.32        a3 = G.addArc(n4, n3), a4 = G.addArc(n3, n1),
   14.33        a5 = G.addArc(n2, n4);
   14.34 -  ignore_unused_variable_warning(a2,a3,a4,a5);
   14.35 +  ::lemon::ignore_unused_variable_warning(a2,a3,a4,a5);
   14.36  
   14.37    // Check arc deletion
   14.38    G.erase(a1);
   14.39 @@ -255,7 +255,7 @@
   14.40    Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
   14.41    Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n2, n1),
   14.42        a3 = G.addArc(n2, n3), a4 = G.addArc(n2, n3);
   14.43 -  ignore_unused_variable_warning(a1,a2,a3,a4);
   14.44 +  ::lemon::ignore_unused_variable_warning(a1,a2,a3,a4);
   14.45  
   14.46    typename Digraph::Snapshot snapshot(G);
   14.47  
   14.48 @@ -356,7 +356,7 @@
   14.49    Arc
   14.50      e1 = g.addArc(n1, n2),
   14.51      e2 = g.addArc(n2, n3);
   14.52 -  ignore_unused_variable_warning(e2);
   14.53 +  ::lemon::ignore_unused_variable_warning(e2);
   14.54  
   14.55    check(g.valid(n1), "Wrong validity check");
   14.56    check(g.valid(e1), "Wrong validity check");
   14.57 @@ -442,7 +442,7 @@
   14.58      a2 = g.addArc(n2, n1),
   14.59      a3 = g.addArc(n2, n3),
   14.60      a4 = g.addArc(n2, n3);
   14.61 -  ignore_unused_variable_warning(a2,a3,a4);
   14.62 +  ::lemon::ignore_unused_variable_warning(a2,a3,a4);
   14.63  
   14.64    digraphCopy(g, G).nodeRef(nref).run();
   14.65  
    15.1 --- a/test/dijkstra_test.cc	Tue Aug 06 17:58:59 2013 +0200
    15.2 +++ b/test/dijkstra_test.cc	Wed Aug 07 07:04:58 2013 +0200
    15.3 @@ -65,7 +65,7 @@
    15.4    VType l;
    15.5    int i;
    15.6    bool b;
    15.7 -  ignore_unused_variable_warning(l,i,b);
    15.8 +  ::lemon::ignore_unused_variable_warning(l,i,b);
    15.9  
   15.10    DType::DistMap d(G);
   15.11    DType::PredMap p(G);
   15.12 @@ -164,7 +164,7 @@
   15.13  
   15.14    Digraph g;
   15.15    bool b;
   15.16 -  ignore_unused_variable_warning(b);
   15.17 +  ::lemon::ignore_unused_variable_warning(b);
   15.18  
   15.19    dijkstra(g,LengthMap()).run(Node());
   15.20    b=dijkstra(g,LengthMap()).run(Node(),Node());
    16.1 --- a/test/edge_set_test.cc	Tue Aug 06 17:58:59 2013 +0200
    16.2 +++ b/test/edge_set_test.cc	Wed Aug 07 07:04:58 2013 +0200
    16.3 @@ -44,12 +44,12 @@
    16.4      n2 = digraph.addNode();
    16.5  
    16.6    Digraph::Arc ga1 = digraph.addArc(n1, n2);
    16.7 -  ignore_unused_variable_warning(ga1);
    16.8 +  ::lemon::ignore_unused_variable_warning(ga1);
    16.9  
   16.10    ArcSet arc_set(digraph);
   16.11  
   16.12    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   16.13 -  ignore_unused_variable_warning(ga2);
   16.14 +  ::lemon::ignore_unused_variable_warning(ga2);
   16.15  
   16.16    checkGraphNodeList(arc_set, 2);
   16.17    checkGraphArcList(arc_set, 0);
   16.18 @@ -77,7 +77,7 @@
   16.19    ArcSet::Arc a2 = arc_set.addArc(n2, n1),
   16.20      a3 = arc_set.addArc(n2, n3),
   16.21      a4 = arc_set.addArc(n2, n3);
   16.22 -  ignore_unused_variable_warning(a2,a3,a4);
   16.23 +  ::lemon::ignore_unused_variable_warning(a2,a3,a4);
   16.24  
   16.25    checkGraphNodeList(arc_set, 3);
   16.26    checkGraphArcList(arc_set, 4);
   16.27 @@ -114,12 +114,12 @@
   16.28      n2 = digraph.addNode();
   16.29  
   16.30    Digraph::Arc ga1 = digraph.addArc(n1, n2);
   16.31 -  ignore_unused_variable_warning(ga1);
   16.32 +  ::lemon::ignore_unused_variable_warning(ga1);
   16.33  
   16.34    ArcSet arc_set(digraph);
   16.35  
   16.36    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   16.37 -  ignore_unused_variable_warning(ga2);
   16.38 +  ::lemon::ignore_unused_variable_warning(ga2);
   16.39  
   16.40    checkGraphNodeList(arc_set, 2);
   16.41    checkGraphArcList(arc_set, 0);
   16.42 @@ -147,7 +147,7 @@
   16.43    ArcSet::Arc a2 = arc_set.addArc(n2, n1),
   16.44      a3 = arc_set.addArc(n2, n3),
   16.45      a4 = arc_set.addArc(n2, n3);
   16.46 -  ignore_unused_variable_warning(a2,a3,a4);
   16.47 +  ::lemon::ignore_unused_variable_warning(a2,a3,a4);
   16.48  
   16.49    checkGraphNodeList(arc_set, 3);
   16.50    checkGraphArcList(arc_set, 4);
   16.51 @@ -198,12 +198,12 @@
   16.52      n2 = digraph.addNode();
   16.53  
   16.54    Digraph::Arc ga1 = digraph.addArc(n1, n2);
   16.55 -  ignore_unused_variable_warning(ga1);
   16.56 +  ::lemon::ignore_unused_variable_warning(ga1);
   16.57  
   16.58    EdgeSet edge_set(digraph);
   16.59  
   16.60    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   16.61 -  ignore_unused_variable_warning(ga2);
   16.62 +  ::lemon::ignore_unused_variable_warning(ga2);
   16.63  
   16.64    checkGraphNodeList(edge_set, 2);
   16.65    checkGraphArcList(edge_set, 0);
   16.66 @@ -240,7 +240,7 @@
   16.67    EdgeSet::Edge e2 = edge_set.addEdge(n2, n1),
   16.68      e3 = edge_set.addEdge(n2, n3),
   16.69      e4 = edge_set.addEdge(n2, n3);
   16.70 -  ignore_unused_variable_warning(e2,e3,e4);
   16.71 +  ::lemon::ignore_unused_variable_warning(e2,e3,e4);
   16.72  
   16.73    checkGraphNodeList(edge_set, 3);
   16.74    checkGraphEdgeList(edge_set, 4);
   16.75 @@ -286,12 +286,12 @@
   16.76      n2 = digraph.addNode();
   16.77  
   16.78    Digraph::Arc ga1 = digraph.addArc(n1, n2);
   16.79 -  ignore_unused_variable_warning(ga1);
   16.80 +  ::lemon::ignore_unused_variable_warning(ga1);
   16.81  
   16.82    EdgeSet edge_set(digraph);
   16.83  
   16.84    Digraph::Arc ga2 = digraph.addArc(n2, n1);
   16.85 -  ignore_unused_variable_warning(ga2);
   16.86 +  ::lemon::ignore_unused_variable_warning(ga2);
   16.87  
   16.88    checkGraphNodeList(edge_set, 2);
   16.89    checkGraphArcList(edge_set, 0);
   16.90 @@ -328,7 +328,7 @@
   16.91    EdgeSet::Edge e2 = edge_set.addEdge(n2, n1),
   16.92      e3 = edge_set.addEdge(n2, n3),
   16.93      e4 = edge_set.addEdge(n2, n3);
   16.94 -  ignore_unused_variable_warning(e2,e3,e4);
   16.95 +  ::lemon::ignore_unused_variable_warning(e2,e3,e4);
   16.96  
   16.97    checkGraphNodeList(edge_set, 3);
   16.98    checkGraphEdgeList(edge_set, 4);
    17.1 --- a/test/euler_test.cc	Tue Aug 06 17:58:59 2013 +0200
    17.2 +++ b/test/euler_test.cc	Wed Aug 07 07:04:58 2013 +0200
    17.3 @@ -101,7 +101,7 @@
    17.4      Digraph d;
    17.5      Graph g(d);
    17.6      Digraph::Node n = d.addNode();
    17.7 -    ignore_unused_variable_warning(n);
    17.8 +    ::lemon::ignore_unused_variable_warning(n);
    17.9    
   17.10      checkDiEulerIt(d);
   17.11      checkDiEulerIt(g);
   17.12 @@ -190,7 +190,7 @@
   17.13      Digraph::Node n3 = d.addNode();
   17.14      Digraph::Node n4 = d.addNode();
   17.15      Digraph::Node n5 = d.addNode();
   17.16 -    ignore_unused_variable_warning(n0,n4,n5);
   17.17 +    ::lemon::ignore_unused_variable_warning(n0,n4,n5);
   17.18  
   17.19      d.addArc(n1, n2);
   17.20      d.addArc(n2, n3);
    18.1 --- a/test/fractional_matching_test.cc	Tue Aug 06 17:58:59 2013 +0200
    18.2 +++ b/test/fractional_matching_test.cc	Wed Aug 07 07:04:58 2013 +0200
    18.3 @@ -342,7 +342,7 @@
    18.4        check(indeg == 1, "Invalid matching");
    18.5        pv += weight[mwfm.matching(n)];
    18.6        SmartGraph::Node o = graph.target(mwfm.matching(n));
    18.7 -      ignore_unused_variable_warning(o);
    18.8 +      ::lemon::ignore_unused_variable_warning(o);
    18.9      } else {
   18.10        check(mwfm.nodeValue(n) == 0, "Invalid matching");
   18.11        check(indeg == 0, "Invalid matching");
   18.12 @@ -407,7 +407,7 @@
   18.13      check(indeg == 1, "Invalid perfect matching");
   18.14      pv += weight[mwpfm.matching(n)];
   18.15      SmartGraph::Node o = graph.target(mwpfm.matching(n));
   18.16 -    ignore_unused_variable_warning(o);
   18.17 +    ::lemon::ignore_unused_variable_warning(o);
   18.18    }
   18.19  
   18.20    for (SmartGraph::EdgeIt e(graph); e != INVALID; ++e) {
    19.1 --- a/test/gomory_hu_test.cc	Tue Aug 06 17:58:59 2013 +0200
    19.2 +++ b/test/gomory_hu_test.cc	Wed Aug 07 07:04:58 2013 +0200
    19.3 @@ -68,7 +68,7 @@
    19.4    CutMap cut;
    19.5    Value v;
    19.6    int d;
    19.7 -  ignore_unused_variable_warning(v,d);
    19.8 +  ::lemon::ignore_unused_variable_warning(v,d);
    19.9  
   19.10    GomoryHu<Graph, CapMap> gh_test(g, cap);
   19.11    const GomoryHu<Graph, CapMap>&
    20.1 --- a/test/graph_test.cc	Tue Aug 06 17:58:59 2013 +0200
    20.2 +++ b/test/graph_test.cc	Wed Aug 07 07:04:58 2013 +0200
    20.3 @@ -66,7 +66,7 @@
    20.4  
    20.5    Edge e2 = G.addEdge(n2, n1),
    20.6         e3 = G.addEdge(n2, n3);
    20.7 -  ignore_unused_variable_warning(e2,e3);
    20.8 +  ::lemon::ignore_unused_variable_warning(e2,e3);
    20.9  
   20.10    checkGraphNodeList(G, 3);
   20.11    checkGraphEdgeList(G, 3);
   20.12 @@ -99,7 +99,7 @@
   20.13    Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
   20.14         e3 = G.addEdge(n2, n3), e4 = G.addEdge(n1, n4),
   20.15         e5 = G.addEdge(n4, n3);
   20.16 -  ignore_unused_variable_warning(e1,e3,e4,e5);
   20.17 +  ::lemon::ignore_unused_variable_warning(e1,e3,e4,e5);
   20.18  
   20.19    checkGraphNodeList(G, 4);
   20.20    checkGraphEdgeList(G, 5);
   20.21 @@ -179,7 +179,7 @@
   20.22    Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
   20.23         e3 = G.addEdge(n2, n3), e4 = G.addEdge(n1, n4),
   20.24         e5 = G.addEdge(n4, n3);
   20.25 -  ignore_unused_variable_warning(e1,e3,e4,e5);
   20.26 +  ::lemon::ignore_unused_variable_warning(e1,e3,e4,e5);
   20.27  
   20.28    // Check edge deletion
   20.29    G.erase(e2);
   20.30 @@ -220,7 +220,7 @@
   20.31    Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
   20.32    Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
   20.33         e3 = G.addEdge(n2, n3);
   20.34 -  ignore_unused_variable_warning(e1,e2,e3);
   20.35 +  ::lemon::ignore_unused_variable_warning(e1,e2,e3);
   20.36  
   20.37    checkGraphNodeList(G, 3);
   20.38    checkGraphEdgeList(G, 3);
   20.39 @@ -385,7 +385,7 @@
   20.40    Edge
   20.41      e1 = g.addEdge(n1, n2),
   20.42      e2 = g.addEdge(n2, n3);
   20.43 -  ignore_unused_variable_warning(e2);
   20.44 +  ::lemon::ignore_unused_variable_warning(e2);
   20.45  
   20.46    check(g.valid(n1), "Wrong validity check");
   20.47    check(g.valid(e1), "Wrong validity check");
   20.48 @@ -524,7 +524,7 @@
   20.49    checkGraphArcList(G, dim * (1 << dim));
   20.50  
   20.51    Node n = G.nodeFromId(dim);
   20.52 -  ignore_unused_variable_warning(n);
   20.53 +  ::lemon::ignore_unused_variable_warning(n);
   20.54  
   20.55    for (NodeIt n(G); n != INVALID; ++n) {
   20.56      checkGraphIncEdgeList(G, n, dim);
    21.1 --- a/test/hao_orlin_test.cc	Tue Aug 06 17:58:59 2013 +0200
    21.2 +++ b/test/hao_orlin_test.cc	Wed Aug 07 07:04:58 2013 +0200
    21.3 @@ -66,7 +66,7 @@
    21.4    CapMap cap;
    21.5    CutMap cut;
    21.6    Value v;
    21.7 -  ignore_unused_variable_warning(v);
    21.8 +  ::lemon::ignore_unused_variable_warning(v);
    21.9  
   21.10    HaoOrlin<Digraph, CapMap> ho_test(g, cap);
   21.11    const HaoOrlin<Digraph, CapMap>&
    22.1 --- a/test/maps_test.cc	Tue Aug 06 17:58:59 2013 +0200
    22.2 +++ b/test/maps_test.cc	Wed Aug 07 07:04:58 2013 +0200
    22.3 @@ -103,7 +103,7 @@
    22.4      checkConcept<ReadWriteMap<A,B>, NullMap<A,B> >();
    22.5      NullMap<A,B> map1;
    22.6      NullMap<A,B> map2 = map1;
    22.7 -    ignore_unused_variable_warning(map2);
    22.8 +    ::lemon::ignore_unused_variable_warning(map2);
    22.9      map1 = nullMap<A,B>();
   22.10    }
   22.11  
   22.12 @@ -114,14 +114,14 @@
   22.13      ConstMap<A,B> map1;
   22.14      ConstMap<A,B> map2 = B();
   22.15      ConstMap<A,B> map3 = map1;
   22.16 -    ignore_unused_variable_warning(map2,map3);
   22.17 +    ::lemon::ignore_unused_variable_warning(map2,map3);
   22.18  
   22.19      map1 = constMap<A>(B());
   22.20      map1 = constMap<A,B>();
   22.21      map1.setAll(B());
   22.22      ConstMap<A,C> map4(C(1));
   22.23      ConstMap<A,C> map5 = map4;
   22.24 -    ignore_unused_variable_warning(map5);
   22.25 +    ::lemon::ignore_unused_variable_warning(map5);
   22.26  
   22.27      map4 = constMap<A>(C(2));
   22.28      map4.setAll(C(3));
   22.29 @@ -143,7 +143,7 @@
   22.30      checkConcept<ReadMap<A,A>, IdentityMap<A> >();
   22.31      IdentityMap<A> map1;
   22.32      IdentityMap<A> map2 = map1;
   22.33 -    ignore_unused_variable_warning(map2);
   22.34 +    ::lemon::ignore_unused_variable_warning(map2);
   22.35  
   22.36      map1 = identityMap<A>();
   22.37  
   22.38 @@ -204,9 +204,9 @@
   22.39      typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
   22.40      checkConcept<ReadMap<B,double>, CompMap>();
   22.41      CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>());
   22.42 -    ignore_unused_variable_warning(map1);
   22.43 +    ::lemon::ignore_unused_variable_warning(map1);
   22.44      CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
   22.45 -    ignore_unused_variable_warning(map2);
   22.46 +    ::lemon::ignore_unused_variable_warning(map2);
   22.47  
   22.48      SparseMap<double, bool> m1(false); m1[3.14] = true;
   22.49      RangeMap<double> m2(2); m2[0] = 3.0; m2[1] = 3.14;
   22.50 @@ -219,9 +219,9 @@
   22.51      typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
   22.52      checkConcept<ReadMap<A,double>, CombMap>();
   22.53      CombMap map1 = CombMap(DoubleMap(), DoubleMap());
   22.54 -    ignore_unused_variable_warning(map1);
   22.55 +    ::lemon::ignore_unused_variable_warning(map1);
   22.56      CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
   22.57 -    ignore_unused_variable_warning(map2);
   22.58 +    ::lemon::ignore_unused_variable_warning(map2);
   22.59  
   22.60      check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
   22.61            "Something is wrong with CombineMap");
   22.62 @@ -233,15 +233,15 @@
   22.63      checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
   22.64      FunctorToMap<F> map1;
   22.65      FunctorToMap<F> map2 = FunctorToMap<F>(F());
   22.66 -    ignore_unused_variable_warning(map2);
   22.67 +    ::lemon::ignore_unused_variable_warning(map2);
   22.68  
   22.69      B b = functorToMap(F())[A()];
   22.70 -    ignore_unused_variable_warning(b);
   22.71 +    ::lemon::ignore_unused_variable_warning(b);
   22.72  
   22.73      checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
   22.74      MapToFunctor<ReadMap<A,B> > map =
   22.75        MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
   22.76 -    ignore_unused_variable_warning(map);
   22.77 +    ::lemon::ignore_unused_variable_warning(map);
   22.78  
   22.79      check(functorToMap(&func)[A()] == 3,
   22.80            "Something is wrong with FunctorToMap");
   22.81 @@ -259,9 +259,9 @@
   22.82      checkConcept<ReadMap<double,double>,
   22.83        ConvertMap<ReadMap<double, int>, double> >();
   22.84      ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true));
   22.85 -    ignore_unused_variable_warning(map1);
   22.86 +    ::lemon::ignore_unused_variable_warning(map1);
   22.87      ConvertMap<RangeMap<bool>, int> map2 = convertMap<int>(rangeMap(2, false));
   22.88 -    ignore_unused_variable_warning(map2);
   22.89 +    ::lemon::ignore_unused_variable_warning(map2);
   22.90  
   22.91    }
   22.92  
    23.1 --- a/test/matching_test.cc	Tue Aug 06 17:58:59 2013 +0200
    23.2 +++ b/test/matching_test.cc	Wed Aug 07 07:04:58 2013 +0200
    23.3 @@ -145,7 +145,7 @@
    23.4  
    23.5    MaxMatching<Graph>::Status stat =
    23.6      const_mat_test.status(n);
    23.7 -  ignore_unused_variable_warning(stat);
    23.8 +  ::lemon::ignore_unused_variable_warning(stat);
    23.9    const MaxMatching<Graph>::StatusMap& smap =
   23.10      const_mat_test.statusMap();
   23.11    stat = smap[n];
    24.1 --- a/test/min_cost_arborescence_test.cc	Tue Aug 06 17:58:59 2013 +0200
    24.2 +++ b/test/min_cost_arborescence_test.cc	Wed Aug 07 07:04:58 2013 +0200
    24.3 @@ -91,7 +91,7 @@
    24.4    Arc e;
    24.5    VType c;
    24.6    bool b;
    24.7 -  ignore_unused_variable_warning(c,b);
    24.8 +  ::lemon::ignore_unused_variable_warning(c,b);
    24.9    int i;
   24.10    CostMap cost;
   24.11    ArbMap arb;
   24.12 @@ -127,8 +127,8 @@
   24.13    i = const_mcarb_test.dualSize(i);
   24.14    c = const_mcarb_test.dualValue(i);
   24.15  
   24.16 -  ignore_unused_variable_warning(am);
   24.17 -  ignore_unused_variable_warning(pm);
   24.18 +  ::lemon::ignore_unused_variable_warning(am);
   24.19 +  ::lemon::ignore_unused_variable_warning(pm);
   24.20  }
   24.21  
   24.22  int main() {
    25.1 --- a/test/suurballe_test.cc	Tue Aug 06 17:58:59 2013 +0200
    25.2 +++ b/test/suurballe_test.cc	Wed Aug 07 07:04:58 2013 +0200
    25.3 @@ -117,7 +117,7 @@
    25.4  
    25.5    int f;
    25.6    VType c;
    25.7 -  ignore_unused_variable_warning(f,c);
    25.8 +  ::lemon::ignore_unused_variable_warning(f,c);
    25.9  
   25.10    c = const_suurb_test.totalLength();
   25.11    f = const_suurb_test.flow(e);
   25.12 @@ -129,8 +129,8 @@
   25.13    k = const_suurb_test.pathNum();
   25.14    Path<Digraph> p = const_suurb_test.path(k);
   25.15  
   25.16 -  ignore_unused_variable_warning(fm);
   25.17 -  ignore_unused_variable_warning(pm);
   25.18 +  ::lemon::ignore_unused_variable_warning(fm);
   25.19 +  ::lemon::ignore_unused_variable_warning(pm);
   25.20  }
   25.21  
   25.22  // Check the feasibility of the flow
    26.1 --- a/test/time_measure_test.cc	Tue Aug 06 17:58:59 2013 +0200
    26.2 +++ b/test/time_measure_test.cc	Wed Aug 07 07:04:58 2013 +0200
    26.3 @@ -35,7 +35,7 @@
    26.4    for(int i=0;i<1000;i++)
    26.5      {
    26.6        TimeStamp x(T);
    26.7 -      ignore_unused_variable_warning(x);
    26.8 +      ::lemon::ignore_unused_variable_warning(x);
    26.9      }
   26.10  }
   26.11