Changeset 1258:bdfc038f364c in lemon for lemon/concepts/digraph.h

Timestamp:

08/07/13 06:31:47 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

1.1

Parents:

1248:14394c9603c2 (diff), 1257:3e711ee55d31 (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 to branch 1.1

Files:

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

lemon/concepts/digraph.h

@@ -325 +325 @@
         /// This constructor sets the iterator to the first arc of \c g.
         ///@param g the digraph
-        ArcIt(const Digraph& g) { ignore_unused_variable_warning(g); }
+        ArcIt(const Digraph& g) { ::lemon::ignore_unused_variable_warning(g); }
         /// Arc -> ArcIt conversion
 

lemon/concepts/digraph.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -436 +436 @@
       private:
         ///Copy constructor
-        NodeMap(const NodeMap& nm) : 
+        NodeMap(const NodeMap& nm) :
           ReferenceMap<Node, T, T&, const T&>(nm) { }
         ///Assignment operator