Changeset 1261:97f1760dcd13 in lemon for lemon/concepts/digraph.h

Timestamp:

08/07/13 07:04:58 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

1256:cae19e9eeca4 (diff), 1260:a337a0dd3f75 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge #294

Files:

• lemon/concepts/digraph.h (modified) (1 diff)
• lemon/concepts/digraph.h (modified) (2 diffs)

lemon/concepts/digraph.h

@@ -313 +313 @@
         /// 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.
 

lemon/concepts/digraph.h

@@ -410 +410 @@
       /// \brief The base node of the iterator.
       ///
-      /// Returns the base node of the given incomming arc iterator
+      /// Returns the base node of the given incoming arc iterator
       /// (i.e. the target node of the corresponding arc).
       Node baseNode(InArcIt) const { return INVALID; }
@@ -416 +416 @@
       /// \brief The running node of the iterator.
       ///
-      /// Returns the running node of the given incomming arc iterator
+      /// Returns the running node of the given incoming arc iterator
       /// (i.e. the source node of the corresponding arc).
       Node runningNode(InArcIt) const { return INVALID; }