1.1 --- a/lemon/concepts/graph.h Mon Jul 16 16:21:40 2018 +0200
1.2 +++ b/lemon/concepts/graph.h Wed Oct 17 19:14:07 2018 +0200
1.3 @@ -2,7 +2,7 @@
1.4 *
1.5 * This file is a part of LEMON, a generic C++ optimization library.
1.6 *
1.7 - * Copyright (C) 2003-2010
1.8 + * Copyright (C) 2003-2013
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -72,10 +72,10 @@
1.13 /// \sa Digraph
1.14 class Graph {
1.15 private:
1.16 - /// Graphs are \e not copy constructible. Use DigraphCopy instead.
1.17 + /// Graphs are \e not copy constructible. Use GraphCopy instead.
1.18 Graph(const Graph&) {}
1.19 /// \brief Assignment of a graph to another one is \e not allowed.
1.20 - /// Use DigraphCopy instead.
1.21 + /// Use GraphCopy instead.
1.22 void operator=(const Graph&) {}
1.23
1.24 public:
1.25 @@ -396,7 +396,9 @@
1.26
1.27 /// Sets the iterator to the first arc of the given graph.
1.28 ///
1.29 - explicit ArcIt(const Graph &g) { ignore_unused_variable_warning(g); }
1.30 + explicit ArcIt(const Graph &g) {
1.31 + ::lemon::ignore_unused_variable_warning(g);
1.32 + }
1.33 /// Sets the iterator to the given arc.
1.34
1.35 /// Sets the iterator to the given arc of the given graph.
1.36 @@ -442,8 +444,8 @@
1.37 /// Sets the iterator to the first outgoing arc of the given node.
1.38 ///
1.39 OutArcIt(const Graph& n, const Node& g) {
1.40 - ignore_unused_variable_warning(n);
1.41 - ignore_unused_variable_warning(g);
1.42 + ::lemon::ignore_unused_variable_warning(n);
1.43 + ::lemon::ignore_unused_variable_warning(g);
1.44 }
1.45 /// Sets the iterator to the given arc.
1.46
1.47 @@ -490,8 +492,8 @@
1.48 /// Sets the iterator to the first incoming arc of the given node.
1.49 ///
1.50 InArcIt(const Graph& g, const Node& n) {
1.51 - ignore_unused_variable_warning(n);
1.52 - ignore_unused_variable_warning(g);
1.53 + ::lemon::ignore_unused_variable_warning(n);
1.54 + ::lemon::ignore_unused_variable_warning(g);
1.55 }
1.56 /// Sets the iterator to the given arc.
1.57
1.58 @@ -757,13 +759,13 @@
1.59
1.60 /// \brief The base node of the iterator.
1.61 ///
1.62 - /// Returns the base node of the given incomming arc iterator
1.63 + /// Returns the base node of the given incoming arc iterator
1.64 /// (i.e. the target node of the corresponding arc).
1.65 Node baseNode(InArcIt) const { return INVALID; }
1.66
1.67 /// \brief The running node of the iterator.
1.68 ///
1.69 - /// Returns the running node of the given incomming arc iterator
1.70 + /// Returns the running node of the given incoming arc iterator
1.71 /// (i.e. the source node of the corresponding arc).
1.72 Node runningNode(InArcIt) const { return INVALID; }
1.73