[Lemon-commits] Alpar Juttner: Merge #294 to branch 1.2
Lemon HG
hg at lemon.cs.elte.hu
Wed Aug 7 07:11:37 CEST 2013
details: http://lemon.cs.elte.hu/hg/lemon/rev/b9887ae63df0
changeset: 1263:b9887ae63df0
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Wed Aug 07 07:09:31 2013 +0200
description:
Merge #294 to branch 1.2
diffstat:
lemon/concept_check.h | 4 ++--
lemon/concepts/digraph.h | 2 +-
lemon/concepts/graph.h | 10 +++++-----
lemon/concepts/graph_components.h | 32 ++++++++++++++++----------------
lemon/concepts/heap.h | 18 +++++++++---------
lemon/concepts/maps.h | 16 ++++++++--------
lemon/concepts/path.h | 30 +++++++++++++++---------------
test/adaptors_test.cc | 6 +++---
test/bellman_ford_test.cc | 6 +++---
test/bfs_test.cc | 4 ++--
test/circulation_test.cc | 4 ++--
test/connectivity_test.cc | 4 ++--
test/dfs_test.cc | 4 ++--
test/digraph_test.cc | 14 +++++++-------
test/dijkstra_test.cc | 4 ++--
test/edge_set_test.cc | 24 ++++++++++++------------
test/euler_test.cc | 4 ++--
test/fractional_matching_test.cc | 4 ++--
test/gomory_hu_test.cc | 2 +-
test/graph_test.cc | 12 ++++++------
test/hao_orlin_test.cc | 2 +-
test/maps_test.cc | 26 +++++++++++++-------------
test/matching_test.cc | 2 +-
test/min_cost_arborescence_test.cc | 6 +++---
test/preflow_test.cc | 4 ++--
test/suurballe_test.cc | 6 +++---
test/time_measure_test.cc | 2 +-
27 files changed, 126 insertions(+), 126 deletions(-)
diffs (truncated from 939 to 300 lines):
diff --git a/lemon/concept_check.h b/lemon/concept_check.h
--- a/lemon/concept_check.h
+++ b/lemon/concept_check.h
@@ -58,7 +58,7 @@
{
#if !defined(NDEBUG)
void (Concept::*x)() = & Concept::constraints;
- ignore_unused_variable_warning(x);
+ ::lemon::ignore_unused_variable_warning(x);
#endif
}
@@ -68,7 +68,7 @@
#if !defined(NDEBUG)
typedef typename Concept::template Constraints<Type> ConceptCheck;
void (ConceptCheck::*x)() = & ConceptCheck::constraints;
- ignore_unused_variable_warning(x);
+ ::lemon::ignore_unused_variable_warning(x);
#endif
}
diff --git a/lemon/concepts/digraph.h b/lemon/concepts/digraph.h
--- a/lemon/concepts/digraph.h
+++ b/lemon/concepts/digraph.h
@@ -312,7 +312,7 @@
/// Sets the iterator to the first arc of the given digraph.
///
- explicit ArcIt(const Digraph& g) { ignore_unused_variable_warning(g); }
+ explicit ArcIt(const Digraph& g) { ::lemon::ignore_unused_variable_warning(g); }
/// Sets the iterator to the given arc.
/// Sets the iterator to the given arc of the given digraph.
diff --git a/lemon/concepts/graph.h b/lemon/concepts/graph.h
--- a/lemon/concepts/graph.h
+++ b/lemon/concepts/graph.h
@@ -396,7 +396,7 @@
/// Sets the iterator to the first arc of the given graph.
///
- explicit ArcIt(const Graph &g) { ignore_unused_variable_warning(g); }
+ explicit ArcIt(const Graph &g) { ::lemon::ignore_unused_variable_warning(g); }
/// Sets the iterator to the given arc.
/// Sets the iterator to the given arc of the given graph.
@@ -442,8 +442,8 @@
/// Sets the iterator to the first outgoing arc of the given node.
///
OutArcIt(const Graph& n, const Node& g) {
- ignore_unused_variable_warning(n);
- ignore_unused_variable_warning(g);
+ ::lemon::ignore_unused_variable_warning(n);
+ ::lemon::ignore_unused_variable_warning(g);
}
/// Sets the iterator to the given arc.
@@ -490,8 +490,8 @@
/// Sets the iterator to the first incoming arc of the given node.
///
InArcIt(const Graph& g, const Node& n) {
- ignore_unused_variable_warning(n);
- ignore_unused_variable_warning(g);
+ ::lemon::ignore_unused_variable_warning(n);
+ ::lemon::ignore_unused_variable_warning(g);
}
/// Sets the iterator to the given arc.
diff --git a/lemon/concepts/graph_components.h b/lemon/concepts/graph_components.h
--- a/lemon/concepts/graph_components.h
+++ b/lemon/concepts/graph_components.h
@@ -108,7 +108,7 @@
i1 = i2 = i3;
bool b;
- ignore_unused_variable_warning(b);
+ ::lemon::ignore_unused_variable_warning(b);
b = (ia == ib) && (ia != ib);
b = (ia == INVALID) && (ib != INVALID);
@@ -289,7 +289,7 @@
e = graph.oppositeArc(e);
ue = e;
bool d = graph.direction(e);
- ignore_unused_variable_warning(d);
+ ::lemon::ignore_unused_variable_warning(d);
}
}
@@ -368,9 +368,9 @@
arc = digraph.arcFromId(eid);
nid = digraph.maxNodeId();
- ignore_unused_variable_warning(nid);
+ ::lemon::ignore_unused_variable_warning(nid);
eid = digraph.maxArcId();
- ignore_unused_variable_warning(eid);
+ ::lemon::ignore_unused_variable_warning(eid);
}
const _Digraph& digraph;
@@ -423,7 +423,7 @@
ueid = graph.id(edge);
edge = graph.edgeFromId(ueid);
ueid = graph.maxEdgeId();
- ignore_unused_variable_warning(ueid);
+ ::lemon::ignore_unused_variable_warning(ueid);
}
const _Graph& graph;
@@ -496,8 +496,8 @@
_GraphItemIt it2;
_GraphItemIt it3 = it1;
_GraphItemIt it4 = INVALID;
- ignore_unused_variable_warning(it3);
- ignore_unused_variable_warning(it4);
+ ::lemon::ignore_unused_variable_warning(it3);
+ ::lemon::ignore_unused_variable_warning(it4);
it2 = ++it1;
++it2 = it1;
@@ -587,8 +587,8 @@
_GraphIncIt it2;
_GraphIncIt it3 = it1;
_GraphIncIt it4 = INVALID;
- ignore_unused_variable_warning(it3);
- ignore_unused_variable_warning(it4);
+ ::lemon::ignore_unused_variable_warning(it3);
+ ::lemon::ignore_unused_variable_warning(it4);
it2 = ++it1;
++it2 = it1;
@@ -770,7 +770,7 @@
n = digraph.runningNode(iait);
n = digraph.baseNode(oait);
n = digraph.runningNode(oait);
- ignore_unused_variable_warning(n);
+ ::lemon::ignore_unused_variable_warning(n);
}
}
@@ -953,8 +953,8 @@
typename _Digraph::ArcNotifier& en
= digraph.notifier(typename _Digraph::Arc());
- ignore_unused_variable_warning(nn);
- ignore_unused_variable_warning(en);
+ ::lemon::ignore_unused_variable_warning(nn);
+ ::lemon::ignore_unused_variable_warning(en);
}
const _Digraph& digraph;
@@ -996,7 +996,7 @@
checkConcept<AlterableDigraphComponent<Base>, _Graph>();
typename _Graph::EdgeNotifier& uen
= graph.notifier(typename _Graph::Edge());
- ignore_unused_variable_warning(uen);
+ ::lemon::ignore_unused_variable_warning(uen);
}
const _Graph& graph;
@@ -1070,9 +1070,9 @@
// ReadMap<Key, Value> cmap;
// m3 = cmap;
- ignore_unused_variable_warning(m1);
- ignore_unused_variable_warning(m2);
- // ignore_unused_variable_warning(m3);
+ ::lemon::ignore_unused_variable_warning(m1);
+ ::lemon::ignore_unused_variable_warning(m2);
+ // ::lemon::ignore_unused_variable_warning(m3);
}
const _Map &m;
diff --git a/lemon/concepts/heap.h b/lemon/concepts/heap.h
--- a/lemon/concepts/heap.h
+++ b/lemon/concepts/heap.h
@@ -260,27 +260,27 @@
Prio prio;
item=Item();
prio=Prio();
- ignore_unused_variable_warning(item);
- ignore_unused_variable_warning(prio);
+ ::lemon::ignore_unused_variable_warning(item);
+ ::lemon::ignore_unused_variable_warning(prio);
OwnItem own_item;
OwnPrio own_prio;
OwnState own_state;
own_item=Item();
own_prio=Prio();
- ignore_unused_variable_warning(own_item);
- ignore_unused_variable_warning(own_prio);
- ignore_unused_variable_warning(own_state);
+ ::lemon::ignore_unused_variable_warning(own_item);
+ ::lemon::ignore_unused_variable_warning(own_prio);
+ ::lemon::ignore_unused_variable_warning(own_state);
_Heap heap1(map);
_Heap heap2 = heap1;
- ignore_unused_variable_warning(heap1);
- ignore_unused_variable_warning(heap2);
+ ::lemon::ignore_unused_variable_warning(heap1);
+ ::lemon::ignore_unused_variable_warning(heap2);
int s = heap.size();
- ignore_unused_variable_warning(s);
+ ::lemon::ignore_unused_variable_warning(s);
bool e = heap.empty();
- ignore_unused_variable_warning(e);
+ ::lemon::ignore_unused_variable_warning(e);
prio = heap.prio();
item = heap.top();
diff --git a/lemon/concepts/maps.h b/lemon/concepts/maps.h
--- a/lemon/concepts/maps.h
+++ b/lemon/concepts/maps.h
@@ -60,10 +60,10 @@
typename _ReadMap::Value own_val = m[own_key];
own_val = m[own_key];
- ignore_unused_variable_warning(key);
- ignore_unused_variable_warning(val);
- ignore_unused_variable_warning(own_key);
- ignore_unused_variable_warning(own_val);
+ ::lemon::ignore_unused_variable_warning(key);
+ ::lemon::ignore_unused_variable_warning(val);
+ ::lemon::ignore_unused_variable_warning(own_key);
+ ::lemon::ignore_unused_variable_warning(own_val);
}
const Key& key;
const typename _ReadMap::Key& own_key;
@@ -100,10 +100,10 @@
m.set(key, val);
m.set(own_key, own_val);
- ignore_unused_variable_warning(key);
- ignore_unused_variable_warning(val);
- ignore_unused_variable_warning(own_key);
- ignore_unused_variable_warning(own_val);
+ ::lemon::ignore_unused_variable_warning(key);
+ ::lemon::ignore_unused_variable_warning(val);
+ ::lemon::ignore_unused_variable_warning(own_key);
+ ::lemon::ignore_unused_variable_warning(own_val);
}
const Key& key;
const Value& val;
diff --git a/lemon/concepts/path.h b/lemon/concepts/path.h
--- a/lemon/concepts/path.h
+++ b/lemon/concepts/path.h
@@ -75,7 +75,7 @@
/// \brief Template assigment operator
template <typename CPath>
Path& operator=(const CPath& cpath) {
- ignore_unused_variable_warning(cpath);
+ ::lemon::ignore_unused_variable_warning(cpath);
return *this;
}
@@ -135,12 +135,12 @@
e = (i != ii);
e = (i < ii);
- ignore_unused_variable_warning(l);
- ignore_unused_variable_warning(pp);
- ignore_unused_variable_warning(e);
- ignore_unused_variable_warning(id);
- ignore_unused_variable_warning(ii);
- ignore_unused_variable_warning(ed);
+ ::lemon::ignore_unused_variable_warning(l);
+ ::lemon::ignore_unused_variable_warning(pp);
+ ::lemon::ignore_unused_variable_warning(e);
+ ::lemon::ignore_unused_variable_warning(id);
+ ::lemon::ignore_unused_variable_warning(ii);
+ ::lemon::ignore_unused_variable_warning(ed);
}
};
@@ -162,10 +162,10 @@
e = (i == INVALID);
e = (i != INVALID);
- ignore_unused_variable_warning(l);
- ignore_unused_variable_warning(e);
- ignore_unused_variable_warning(id);
- ignore_unused_variable_warning(ed);
+ ::lemon::ignore_unused_variable_warning(l);
+ ::lemon::ignore_unused_variable_warning(e);
+ ::lemon::ignore_unused_variable_warning(id);
+ ::lemon::ignore_unused_variable_warning(ed);
}
_Path& p;
PathDumperConstraints() {}
@@ -188,10 +188,10 @@
e = (i == INVALID);
e = (i != INVALID);
- ignore_unused_variable_warning(l);
- ignore_unused_variable_warning(e);
- ignore_unused_variable_warning(id);
- ignore_unused_variable_warning(ed);
More information about the Lemon-commits
mailing list