1.1 --- a/lemon/concept_check.h Wed Nov 28 11:58:00 2012 +0100
1.2 +++ b/lemon/concept_check.h Wed Aug 07 06:55:05 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 Wed Nov 28 11:58:00 2012 +0100
2.2 +++ b/lemon/concepts/digraph.h Wed Aug 07 06:55:05 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 Wed Nov 28 11:58:00 2012 +0100
3.2 +++ b/lemon/concepts/graph.h Wed Aug 07 06:55:05 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 Wed Nov 28 11:58:00 2012 +0100
4.2 +++ b/lemon/concepts/graph_components.h Wed Aug 07 06:55:05 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 Wed Nov 28 11:58:00 2012 +0100
5.2 +++ b/lemon/concepts/heap.h Wed Aug 07 06:55:05 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 Wed Nov 28 11:58:00 2012 +0100
6.2 +++ b/lemon/concepts/maps.h Wed Aug 07 06:55:05 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 Wed Nov 28 11:58:00 2012 +0100
7.2 +++ b/lemon/concepts/path.h Wed Aug 07 06:55:05 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/lemon/core.h Wed Nov 28 11:58:00 2012 +0100
8.2 +++ b/lemon/core.h Wed Aug 07 06:55:05 2013 +0200
8.3 @@ -37,6 +37,17 @@
8.4 #pragma warning( disable : 4250 4355 4503 4800 4996 )
8.5 #endif
8.6
8.7 +#ifdef __GNUC__
8.8 +#define GCC_VERSION (__GNUC__ * 10000 \
8.9 + + __GNUC_MINOR__ * 100 \
8.10 + + __GNUC_PATCHLEVEL__)
8.11 +#endif
8.12 +
8.13 +#if GCC_VERSION >= 40800
8.14 +// Needed by the [DI]GRAPH_TYPEDEFS marcos for gcc 4.8
8.15 +#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
8.16 +#endif
8.17 +
8.18 ///\file
8.19 ///\brief LEMON core utilities.
8.20 ///
9.1 --- a/lemon/cplex.cc Wed Nov 28 11:58:00 2012 +0100
9.2 +++ b/lemon/cplex.cc Wed Aug 07 06:55:05 2013 +0200
9.3 @@ -40,6 +40,7 @@
9.4 CplexEnv::CplexEnv() {
9.5 int status;
9.6 _cnt = new int;
9.7 + (*_cnt) = 1;
9.8 _env = CPXopenCPLEX(&status);
9.9 if (_env == 0) {
9.10 delete _cnt;
10.1 --- a/lemon/graph_to_eps.h Wed Nov 28 11:58:00 2012 +0100
10.2 +++ b/lemon/graph_to_eps.h Wed Aug 07 06:55:05 2013 +0200
10.3 @@ -222,7 +222,7 @@
10.4 using T::_title;
10.5 using T::_copyright;
10.6
10.7 - using typename T::NodeTextColorType;
10.8 + using T::NodeTextColorType;
10.9 using T::CUST_COL;
10.10 using T::DIST_COL;
10.11 using T::DIST_BW;
11.1 --- a/test/adaptors_test.cc Wed Nov 28 11:58:00 2012 +0100
11.2 +++ b/test/adaptors_test.cc Wed Aug 07 06:55:05 2013 +0200
11.3 @@ -65,7 +65,7 @@
11.4 Digraph::Arc a1 = digraph.addArc(n1, n2);
11.5 Digraph::Arc a2 = digraph.addArc(n1, n3);
11.6 Digraph::Arc a3 = digraph.addArc(n2, n3);
11.7 - ignore_unused_variable_warning(a3);
11.8 + ::lemon::ignore_unused_variable_warning(a3);
11.9
11.10 // Check the adaptor
11.11 checkGraphNodeList(adaptor, 3);
11.12 @@ -100,7 +100,7 @@
11.13 Adaptor::Arc a6 = adaptor.addArc(n2, n4);
11.14 Adaptor::Arc a7 = adaptor.addArc(n1, n4);
11.15 Adaptor::Arc a8 = adaptor.addArc(n1, n2);
11.16 - ignore_unused_variable_warning(a6,a7,a8);
11.17 + ::lemon::ignore_unused_variable_warning(a6,a7,a8);
11.18
11.19 adaptor.erase(a1);
11.20 adaptor.erase(n3);
11.21 @@ -760,7 +760,7 @@
11.22 Digraph::Arc a1 = digraph.addArc(n1, n2);
11.23 Digraph::Arc a2 = digraph.addArc(n1, n3);
11.24 Digraph::Arc a3 = digraph.addArc(n2, n3);
11.25 - ignore_unused_variable_warning(a1,a2,a3);
11.26 + ::lemon::ignore_unused_variable_warning(a1,a2,a3);
11.27
11.28 checkGraphNodeList(adaptor, 6);
11.29 checkGraphArcList(adaptor, 6);
12.1 --- a/test/bfs_test.cc Wed Nov 28 11:58:00 2012 +0100
12.2 +++ b/test/bfs_test.cc Wed Aug 07 06:55:05 2013 +0200
12.3 @@ -61,7 +61,7 @@
12.4 Node s, t, n;
12.5 Arc e;
12.6 int l, i;
12.7 - ignore_unused_variable_warning(l,i);
12.8 + ::lemon::ignore_unused_variable_warning(l,i);
12.9 bool b;
12.10 BType::DistMap d(G);
12.11 BType::PredMap p(G);
12.12 @@ -151,7 +151,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 bfs(g).run(Node());
12.20 b=bfs(g).run(Node(),Node());
13.1 --- a/test/circulation_test.cc Wed Nov 28 11:58:00 2012 +0100
13.2 +++ b/test/circulation_test.cc Wed Aug 07 06:55:05 2013 +0200
13.3 @@ -73,7 +73,7 @@
13.4 BarrierMap bar;
13.5 VType v;
13.6 bool b;
13.7 - ignore_unused_variable_warning(v,b);
13.8 + ::lemon::ignore_unused_variable_warning(v,b);
13.9
13.10 typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
13.11 ::SetFlowMap<FlowMap>
13.12 @@ -104,7 +104,7 @@
13.13 b = const_circ_test.barrier(n);
13.14 const_circ_test.barrierMap(bar);
13.15
13.16 - ignore_unused_variable_warning(fm);
13.17 + ::lemon::ignore_unused_variable_warning(fm);
13.18 }
13.19
13.20 template <class G, class LM, class UM, class DM>
14.1 --- a/test/connectivity_test.cc Wed Nov 28 11:58:00 2012 +0100
14.2 +++ b/test/connectivity_test.cc Wed Aug 07 06:55:05 2013 +0200
14.3 @@ -68,7 +68,7 @@
14.4 Digraph::NodeMap<int> order(d);
14.5 Graph g(d);
14.6 Digraph::Node n = d.addNode();
14.7 - ignore_unused_variable_warning(n);
14.8 + ::lemon::ignore_unused_variable_warning(n);
14.9
14.10 check(stronglyConnected(d), "This digraph is strongly connected");
14.11 check(countStronglyConnectedComponents(d) == 1,
14.12 @@ -246,7 +246,7 @@
14.13 Digraph::Node shoe = d.addNode();
14.14 Digraph::Node watch = d.addNode();
14.15 Digraph::Node pants = d.addNode();
14.16 - ignore_unused_variable_warning(watch);
14.17 + ::lemon::ignore_unused_variable_warning(watch);
14.18
14.19 d.addArc(socks, shoe);
14.20 d.addArc(pants, shoe);
15.1 --- a/test/dfs_test.cc Wed Nov 28 11:58:00 2012 +0100
15.2 +++ b/test/dfs_test.cc Wed Aug 07 06:55:05 2013 +0200
15.3 @@ -67,7 +67,7 @@
15.4 Arc e;
15.5 int l, 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 @@ -153,7 +153,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 dfs(g).run(Node());
15.20 b=dfs(g).run(Node(),Node());
16.1 --- a/test/digraph_test.cc Wed Nov 28 11:58:00 2012 +0100
16.2 +++ b/test/digraph_test.cc Wed Aug 07 06:55:05 2013 +0200
16.3 @@ -64,7 +64,7 @@
16.4 Arc a2 = G.addArc(n2, n1),
16.5 a3 = G.addArc(n2, n3),
16.6 a4 = G.addArc(n2, n3);
16.7 - ignore_unused_variable_warning(a2,a3,a4);
16.8 + ::lemon::ignore_unused_variable_warning(a2,a3,a4);
16.9
16.10 checkGraphNodeList(G, 3);
16.11 checkGraphArcList(G, 4);
16.12 @@ -93,7 +93,7 @@
16.13 Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
16.14 Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n2, n1),
16.15 a3 = G.addArc(n2, n3), a4 = G.addArc(n2, n3);
16.16 - ignore_unused_variable_warning(a1,a2,a3,a4);
16.17 + ::lemon::ignore_unused_variable_warning(a1,a2,a3,a4);
16.18
16.19 Node n4 = G.split(n2);
16.20
16.21 @@ -127,7 +127,7 @@
16.22 Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n4, n1),
16.23 a3 = G.addArc(n4, n3), a4 = G.addArc(n4, n3),
16.24 a5 = G.addArc(n2, n4);
16.25 - ignore_unused_variable_warning(a1,a2,a3,a5);
16.26 + ::lemon::ignore_unused_variable_warning(a1,a2,a3,a5);
16.27
16.28 checkGraphNodeList(G, 4);
16.29 checkGraphArcList(G, 5);
16.30 @@ -207,7 +207,7 @@
16.31 Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n4, n1),
16.32 a3 = G.addArc(n4, n3), a4 = G.addArc(n3, n1),
16.33 a5 = G.addArc(n2, n4);
16.34 - ignore_unused_variable_warning(a2,a3,a4,a5);
16.35 + ::lemon::ignore_unused_variable_warning(a2,a3,a4,a5);
16.36
16.37 // Check arc deletion
16.38 G.erase(a1);
16.39 @@ -255,7 +255,7 @@
16.40 Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
16.41 Arc a1 = G.addArc(n1, n2), a2 = G.addArc(n2, n1),
16.42 a3 = G.addArc(n2, n3), a4 = G.addArc(n2, n3);
16.43 - ignore_unused_variable_warning(a1,a2,a3,a4);
16.44 + ::lemon::ignore_unused_variable_warning(a1,a2,a3,a4);
16.45
16.46 typename Digraph::Snapshot snapshot(G);
16.47
16.48 @@ -356,7 +356,7 @@
16.49 Arc
16.50 e1 = g.addArc(n1, n2),
16.51 e2 = g.addArc(n2, n3);
16.52 - ignore_unused_variable_warning(e2);
16.53 + ::lemon::ignore_unused_variable_warning(e2);
16.54
16.55 check(g.valid(n1), "Wrong validity check");
16.56 check(g.valid(e1), "Wrong validity check");
17.1 --- a/test/dijkstra_test.cc Wed Nov 28 11:58:00 2012 +0100
17.2 +++ b/test/dijkstra_test.cc Wed Aug 07 06:55:05 2013 +0200
17.3 @@ -65,7 +65,7 @@
17.4 VType l;
17.5 int i;
17.6 bool b;
17.7 - ignore_unused_variable_warning(l,i,b);
17.8 + ::lemon::ignore_unused_variable_warning(l,i,b);
17.9
17.10 DType::DistMap d(G);
17.11 DType::PredMap p(G);
17.12 @@ -164,7 +164,7 @@
17.13
17.14 Digraph g;
17.15 bool b;
17.16 - ignore_unused_variable_warning(b);
17.17 + ::lemon::ignore_unused_variable_warning(b);
17.18
17.19 dijkstra(g,LengthMap()).run(Node());
17.20 b=dijkstra(g,LengthMap()).run(Node(),Node());
18.1 --- a/test/edge_set_test.cc Wed Nov 28 11:58:00 2012 +0100
18.2 +++ b/test/edge_set_test.cc Wed Aug 07 06:55:05 2013 +0200
18.3 @@ -44,12 +44,12 @@
18.4 n2 = digraph.addNode();
18.5
18.6 Digraph::Arc ga1 = digraph.addArc(n1, n2);
18.7 - ignore_unused_variable_warning(ga1);
18.8 + ::lemon::ignore_unused_variable_warning(ga1);
18.9
18.10 ArcSet arc_set(digraph);
18.11
18.12 Digraph::Arc ga2 = digraph.addArc(n2, n1);
18.13 - ignore_unused_variable_warning(ga2);
18.14 + ::lemon::ignore_unused_variable_warning(ga2);
18.15
18.16 checkGraphNodeList(arc_set, 2);
18.17 checkGraphArcList(arc_set, 0);
18.18 @@ -77,7 +77,7 @@
18.19 ArcSet::Arc a2 = arc_set.addArc(n2, n1),
18.20 a3 = arc_set.addArc(n2, n3),
18.21 a4 = arc_set.addArc(n2, n3);
18.22 - ignore_unused_variable_warning(a2,a3,a4);
18.23 + ::lemon::ignore_unused_variable_warning(a2,a3,a4);
18.24
18.25 checkGraphNodeList(arc_set, 3);
18.26 checkGraphArcList(arc_set, 4);
18.27 @@ -114,12 +114,12 @@
18.28 n2 = digraph.addNode();
18.29
18.30 Digraph::Arc ga1 = digraph.addArc(n1, n2);
18.31 - ignore_unused_variable_warning(ga1);
18.32 + ::lemon::ignore_unused_variable_warning(ga1);
18.33
18.34 ArcSet arc_set(digraph);
18.35
18.36 Digraph::Arc ga2 = digraph.addArc(n2, n1);
18.37 - ignore_unused_variable_warning(ga2);
18.38 + ::lemon::ignore_unused_variable_warning(ga2);
18.39
18.40 checkGraphNodeList(arc_set, 2);
18.41 checkGraphArcList(arc_set, 0);
18.42 @@ -147,7 +147,7 @@
18.43 ArcSet::Arc a2 = arc_set.addArc(n2, n1),
18.44 a3 = arc_set.addArc(n2, n3),
18.45 a4 = arc_set.addArc(n2, n3);
18.46 - ignore_unused_variable_warning(a2,a3,a4);
18.47 + ::lemon::ignore_unused_variable_warning(a2,a3,a4);
18.48
18.49 checkGraphNodeList(arc_set, 3);
18.50 checkGraphArcList(arc_set, 4);
18.51 @@ -198,12 +198,12 @@
18.52 n2 = digraph.addNode();
18.53
18.54 Digraph::Arc ga1 = digraph.addArc(n1, n2);
18.55 - ignore_unused_variable_warning(ga1);
18.56 + ::lemon::ignore_unused_variable_warning(ga1);
18.57
18.58 EdgeSet edge_set(digraph);
18.59
18.60 Digraph::Arc ga2 = digraph.addArc(n2, n1);
18.61 - ignore_unused_variable_warning(ga2);
18.62 + ::lemon::ignore_unused_variable_warning(ga2);
18.63
18.64 checkGraphNodeList(edge_set, 2);
18.65 checkGraphArcList(edge_set, 0);
18.66 @@ -240,7 +240,7 @@
18.67 EdgeSet::Edge e2 = edge_set.addEdge(n2, n1),
18.68 e3 = edge_set.addEdge(n2, n3),
18.69 e4 = edge_set.addEdge(n2, n3);
18.70 - ignore_unused_variable_warning(e2,e3,e4);
18.71 + ::lemon::ignore_unused_variable_warning(e2,e3,e4);
18.72
18.73 checkGraphNodeList(edge_set, 3);
18.74 checkGraphEdgeList(edge_set, 4);
18.75 @@ -286,12 +286,12 @@
18.76 n2 = digraph.addNode();
18.77
18.78 Digraph::Arc ga1 = digraph.addArc(n1, n2);
18.79 - ignore_unused_variable_warning(ga1);
18.80 + ::lemon::ignore_unused_variable_warning(ga1);
18.81
18.82 EdgeSet edge_set(digraph);
18.83
18.84 Digraph::Arc ga2 = digraph.addArc(n2, n1);
18.85 - ignore_unused_variable_warning(ga2);
18.86 + ::lemon::ignore_unused_variable_warning(ga2);
18.87
18.88 checkGraphNodeList(edge_set, 2);
18.89 checkGraphArcList(edge_set, 0);
18.90 @@ -328,7 +328,7 @@
18.91 EdgeSet::Edge e2 = edge_set.addEdge(n2, n1),
18.92 e3 = edge_set.addEdge(n2, n3),
18.93 e4 = edge_set.addEdge(n2, n3);
18.94 - ignore_unused_variable_warning(e2,e3,e4);
18.95 + ::lemon::ignore_unused_variable_warning(e2,e3,e4);
18.96
18.97 checkGraphNodeList(edge_set, 3);
18.98 checkGraphEdgeList(edge_set, 4);
19.1 --- a/test/euler_test.cc Wed Nov 28 11:58:00 2012 +0100
19.2 +++ b/test/euler_test.cc Wed Aug 07 06:55:05 2013 +0200
19.3 @@ -101,7 +101,7 @@
19.4 Digraph d;
19.5 Graph g(d);
19.6 Digraph::Node n = d.addNode();
19.7 - ignore_unused_variable_warning(n);
19.8 + ::lemon::ignore_unused_variable_warning(n);
19.9
19.10 checkDiEulerIt(d);
19.11 checkDiEulerIt(g);
19.12 @@ -190,7 +190,7 @@
19.13 Digraph::Node n3 = d.addNode();
19.14 Digraph::Node n4 = d.addNode();
19.15 Digraph::Node n5 = d.addNode();
19.16 - ignore_unused_variable_warning(n0,n4,n5);
19.17 + ::lemon::ignore_unused_variable_warning(n0,n4,n5);
19.18
19.19 d.addArc(n1, n2);
19.20 d.addArc(n2, n3);
20.1 --- a/test/gomory_hu_test.cc Wed Nov 28 11:58:00 2012 +0100
20.2 +++ b/test/gomory_hu_test.cc Wed Aug 07 06:55:05 2013 +0200
20.3 @@ -68,7 +68,7 @@
20.4 CutMap cut;
20.5 Value v;
20.6 int d;
20.7 - ignore_unused_variable_warning(v,d);
20.8 + ::lemon::ignore_unused_variable_warning(v,d);
20.9
20.10 GomoryHu<Graph, CapMap> gh_test(g, cap);
20.11 const GomoryHu<Graph, CapMap>&
21.1 --- a/test/graph_test.cc Wed Nov 28 11:58:00 2012 +0100
21.2 +++ b/test/graph_test.cc Wed Aug 07 06:55:05 2013 +0200
21.3 @@ -66,7 +66,7 @@
21.4
21.5 Edge e2 = G.addEdge(n2, n1),
21.6 e3 = G.addEdge(n2, n3);
21.7 - ignore_unused_variable_warning(e2,e3);
21.8 + ::lemon::ignore_unused_variable_warning(e2,e3);
21.9
21.10 checkGraphNodeList(G, 3);
21.11 checkGraphEdgeList(G, 3);
21.12 @@ -99,7 +99,7 @@
21.13 Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
21.14 e3 = G.addEdge(n2, n3), e4 = G.addEdge(n1, n4),
21.15 e5 = G.addEdge(n4, n3);
21.16 - ignore_unused_variable_warning(e1,e3,e4,e5);
21.17 + ::lemon::ignore_unused_variable_warning(e1,e3,e4,e5);
21.18
21.19 checkGraphNodeList(G, 4);
21.20 checkGraphEdgeList(G, 5);
21.21 @@ -179,7 +179,7 @@
21.22 Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
21.23 e3 = G.addEdge(n2, n3), e4 = G.addEdge(n1, n4),
21.24 e5 = G.addEdge(n4, n3);
21.25 - ignore_unused_variable_warning(e1,e3,e4,e5);
21.26 + ::lemon::ignore_unused_variable_warning(e1,e3,e4,e5);
21.27
21.28 // Check edge deletion
21.29 G.erase(e2);
21.30 @@ -220,7 +220,7 @@
21.31 Node n1 = G.addNode(), n2 = G.addNode(), n3 = G.addNode();
21.32 Edge e1 = G.addEdge(n1, n2), e2 = G.addEdge(n2, n1),
21.33 e3 = G.addEdge(n2, n3);
21.34 - ignore_unused_variable_warning(e1,e2,e3);
21.35 + ::lemon::ignore_unused_variable_warning(e1,e2,e3);
21.36
21.37 checkGraphNodeList(G, 3);
21.38 checkGraphEdgeList(G, 3);
21.39 @@ -385,7 +385,7 @@
21.40 Edge
21.41 e1 = g.addEdge(n1, n2),
21.42 e2 = g.addEdge(n2, n3);
21.43 - ignore_unused_variable_warning(e2);
21.44 + ::lemon::ignore_unused_variable_warning(e2);
21.45
21.46 check(g.valid(n1), "Wrong validity check");
21.47 check(g.valid(e1), "Wrong validity check");
21.48 @@ -524,7 +524,7 @@
21.49 checkGraphArcList(G, dim * (1 << dim));
21.50
21.51 Node n = G.nodeFromId(dim);
21.52 - ignore_unused_variable_warning(n);
21.53 + ::lemon::ignore_unused_variable_warning(n);
21.54
21.55 for (NodeIt n(G); n != INVALID; ++n) {
21.56 checkGraphIncEdgeList(G, n, dim);
22.1 --- a/test/hao_orlin_test.cc Wed Nov 28 11:58:00 2012 +0100
22.2 +++ b/test/hao_orlin_test.cc Wed Aug 07 06:55:05 2013 +0200
22.3 @@ -66,7 +66,7 @@
22.4 CapMap cap;
22.5 CutMap cut;
22.6 Value v;
22.7 - ignore_unused_variable_warning(v);
22.8 + ::lemon::ignore_unused_variable_warning(v);
22.9
22.10 HaoOrlin<Digraph, CapMap> ho_test(g, cap);
22.11 const HaoOrlin<Digraph, CapMap>&
23.1 --- a/test/lp_test.cc Wed Nov 28 11:58:00 2012 +0100
23.2 +++ b/test/lp_test.cc Wed Aug 07 06:55:05 2013 +0200
23.3 @@ -198,7 +198,12 @@
23.4 LP::Constr c = v >= -3;
23.5 c = c <= 4;
23.6 LP::Constr c2;
23.7 +#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 3 )
23.8 + c2 = ( -3 <= v ) <= 4;
23.9 +#else
23.10 c2 = -3 <= v <= 4;
23.11 +#endif
23.12 +
23.13 }
23.14
23.15 e[x[3]]=2;
23.16 @@ -240,8 +245,7 @@
23.17
23.18 {
23.19 LP::DualExpr e,f,g;
23.20 - LP::Row p1 = INVALID, p2 = INVALID, p3 = INVALID,
23.21 - p4 = INVALID, p5 = INVALID;
23.22 + LP::Row p1 = INVALID, p2 = INVALID;
23.23
23.24 e[p1]=2;
23.25 e[p1]+=2;
24.1 --- a/test/maps_test.cc Wed Nov 28 11:58:00 2012 +0100
24.2 +++ b/test/maps_test.cc Wed Aug 07 06:55:05 2013 +0200
24.3 @@ -103,7 +103,7 @@
24.4 checkConcept<ReadWriteMap<A,B>, NullMap<A,B> >();
24.5 NullMap<A,B> map1;
24.6 NullMap<A,B> map2 = map1;
24.7 - ignore_unused_variable_warning(map2);
24.8 + ::lemon::ignore_unused_variable_warning(map2);
24.9 map1 = nullMap<A,B>();
24.10 }
24.11
24.12 @@ -114,14 +114,14 @@
24.13 ConstMap<A,B> map1;
24.14 ConstMap<A,B> map2 = B();
24.15 ConstMap<A,B> map3 = map1;
24.16 - ignore_unused_variable_warning(map2,map3);
24.17 + ::lemon::ignore_unused_variable_warning(map2,map3);
24.18
24.19 map1 = constMap<A>(B());
24.20 map1 = constMap<A,B>();
24.21 map1.setAll(B());
24.22 ConstMap<A,C> map4(C(1));
24.23 ConstMap<A,C> map5 = map4;
24.24 - ignore_unused_variable_warning(map5);
24.25 + ::lemon::ignore_unused_variable_warning(map5);
24.26
24.27 map4 = constMap<A>(C(2));
24.28 map4.setAll(C(3));
24.29 @@ -143,7 +143,7 @@
24.30 checkConcept<ReadMap<A,A>, IdentityMap<A> >();
24.31 IdentityMap<A> map1;
24.32 IdentityMap<A> map2 = map1;
24.33 - ignore_unused_variable_warning(map2);
24.34 + ::lemon::ignore_unused_variable_warning(map2);
24.35
24.36 map1 = identityMap<A>();
24.37
24.38 @@ -204,9 +204,9 @@
24.39 typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
24.40 checkConcept<ReadMap<B,double>, CompMap>();
24.41 CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>());
24.42 - ignore_unused_variable_warning(map1);
24.43 + ::lemon::ignore_unused_variable_warning(map1);
24.44 CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
24.45 - ignore_unused_variable_warning(map2);
24.46 + ::lemon::ignore_unused_variable_warning(map2);
24.47
24.48 SparseMap<double, bool> m1(false); m1[3.14] = true;
24.49 RangeMap<double> m2(2); m2[0] = 3.0; m2[1] = 3.14;
24.50 @@ -219,9 +219,9 @@
24.51 typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
24.52 checkConcept<ReadMap<A,double>, CombMap>();
24.53 CombMap map1 = CombMap(DoubleMap(), DoubleMap());
24.54 - ignore_unused_variable_warning(map1);
24.55 + ::lemon::ignore_unused_variable_warning(map1);
24.56 CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
24.57 - ignore_unused_variable_warning(map2);
24.58 + ::lemon::ignore_unused_variable_warning(map2);
24.59
24.60 check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
24.61 "Something is wrong with CombineMap");
24.62 @@ -233,15 +233,15 @@
24.63 checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
24.64 FunctorToMap<F> map1;
24.65 FunctorToMap<F> map2 = FunctorToMap<F>(F());
24.66 - ignore_unused_variable_warning(map2);
24.67 + ::lemon::ignore_unused_variable_warning(map2);
24.68
24.69 B b = functorToMap(F())[A()];
24.70 - ignore_unused_variable_warning(b);
24.71 + ::lemon::ignore_unused_variable_warning(b);
24.72
24.73 checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
24.74 MapToFunctor<ReadMap<A,B> > map =
24.75 MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
24.76 - ignore_unused_variable_warning(map);
24.77 + ::lemon::ignore_unused_variable_warning(map);
24.78
24.79 check(functorToMap(&func)[A()] == 3,
24.80 "Something is wrong with FunctorToMap");
24.81 @@ -259,9 +259,9 @@
24.82 checkConcept<ReadMap<double,double>,
24.83 ConvertMap<ReadMap<double, int>, double> >();
24.84 ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true));
24.85 - ignore_unused_variable_warning(map1);
24.86 + ::lemon::ignore_unused_variable_warning(map1);
24.87 ConvertMap<RangeMap<bool>, int> map2 = convertMap<int>(rangeMap(2, false));
24.88 - ignore_unused_variable_warning(map2);
24.89 + ::lemon::ignore_unused_variable_warning(map2);
24.90
24.91 }
24.92
25.1 --- a/test/matching_test.cc Wed Nov 28 11:58:00 2012 +0100
25.2 +++ b/test/matching_test.cc Wed Aug 07 06:55:05 2013 +0200
25.3 @@ -145,7 +145,7 @@
25.4
25.5 MaxMatching<Graph>::Status stat =
25.6 const_mat_test.status(n);
25.7 - ignore_unused_variable_warning(stat);
25.8 + ::lemon::ignore_unused_variable_warning(stat);
25.9 const MaxMatching<Graph>::StatusMap& smap =
25.10 const_mat_test.statusMap();
25.11 stat = smap[n];
26.1 --- a/test/min_cost_arborescence_test.cc Wed Nov 28 11:58:00 2012 +0100
26.2 +++ b/test/min_cost_arborescence_test.cc Wed Aug 07 06:55:05 2013 +0200
26.3 @@ -91,7 +91,7 @@
26.4 Arc e;
26.5 VType c;
26.6 bool b;
26.7 - ignore_unused_variable_warning(c,b);
26.8 + ::lemon::ignore_unused_variable_warning(c,b);
26.9 int i;
26.10 CostMap cost;
26.11 ArbMap arb;
26.12 @@ -127,8 +127,8 @@
26.13 i = const_mcarb_test.dualSize(i);
26.14 c = const_mcarb_test.dualValue(i);
26.15
26.16 - ignore_unused_variable_warning(am);
26.17 - ignore_unused_variable_warning(pm);
26.18 + ::lemon::ignore_unused_variable_warning(am);
26.19 + ::lemon::ignore_unused_variable_warning(pm);
26.20 }
26.21
26.22 int main() {
27.1 --- a/test/preflow_test.cc Wed Nov 28 11:58:00 2012 +0100
27.2 +++ b/test/preflow_test.cc Wed Aug 07 06:55:05 2013 +0200
27.3 @@ -86,7 +86,7 @@
27.4 CutMap cut;
27.5 VType v;
27.6 bool b;
27.7 - ignore_unused_variable_warning(v,b);
27.8 + ::lemon::ignore_unused_variable_warning(v,b);
27.9
27.10 typedef Preflow<Digraph, CapMap>
27.11 ::SetFlowMap<FlowMap>
27.12 @@ -120,7 +120,7 @@
27.13 b = const_preflow_test.minCut(n);
27.14 const_preflow_test.minCutMap(cut);
27.15
27.16 - ignore_unused_variable_warning(fm);
27.17 + ::lemon::ignore_unused_variable_warning(fm);
27.18 }
27.19
27.20 int cutValue (const SmartDigraph& g,
28.1 --- a/test/suurballe_test.cc Wed Nov 28 11:58:00 2012 +0100
28.2 +++ b/test/suurballe_test.cc Wed Aug 07 06:55:05 2013 +0200
28.3 @@ -117,7 +117,7 @@
28.4
28.5 int f;
28.6 VType c;
28.7 - ignore_unused_variable_warning(f,c);
28.8 + ::lemon::ignore_unused_variable_warning(f,c);
28.9
28.10 c = const_suurb_test.totalLength();
28.11 f = const_suurb_test.flow(e);
28.12 @@ -129,8 +129,8 @@
28.13 k = const_suurb_test.pathNum();
28.14 Path<Digraph> p = const_suurb_test.path(k);
28.15
28.16 - ignore_unused_variable_warning(fm);
28.17 - ignore_unused_variable_warning(pm);
28.18 + ::lemon::ignore_unused_variable_warning(fm);
28.19 + ::lemon::ignore_unused_variable_warning(pm);
28.20 }
28.21
28.22 // Check the feasibility of the flow
29.1 --- a/test/time_measure_test.cc Wed Nov 28 11:58:00 2012 +0100
29.2 +++ b/test/time_measure_test.cc Wed Aug 07 06:55:05 2013 +0200
29.3 @@ -35,7 +35,7 @@
29.4 for(int i=0;i<1000;i++)
29.5 {
29.6 TimeStamp x(T);
29.7 - ignore_unused_variable_warning(x);
29.8 + ::lemon::ignore_unused_variable_warning(x);
29.9 }
29.10 }
29.11