[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/30d22b636e57
changeset: 456:30d22b636e57
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Fri Dec 12 22:16:17 2008 +0000
description:
	Merge

diffstat:

1 file changed, 4 insertions(+), 4 deletions(-)
lemon/core.h |    8 ++++----

diffs (29 lines):

diff --git a/lemon/core.h b/lemon/core.h
--- a/lemon/core.h
+++ b/lemon/core.h
@@ -1170,8 +1170,8 @@
     ///
     /// Construct a new ConEdgeIt iterating on the edges that
     /// connects nodes \c u and \c v.
-    ConEdgeIt(const Graph& g, Node u, Node v) : _graph(g) {
-      Parent::operator=(findEdge(_graph, u, v));
+    ConEdgeIt(const Graph& g, Node u, Node v) : _graph(g), _u(u), _v(v) {
+      Parent::operator=(findEdge(_graph, _u, _v));
     }
 
     /// \brief Constructor.
@@ -1183,12 +1183,12 @@
     ///
     /// It increments the iterator and gives back the next edge.
     ConEdgeIt& operator++() {
-      Parent::operator=(findEdge(_graph, _graph.u(*this),
-                                 _graph.v(*this), *this));
+      Parent::operator=(findEdge(_graph, _u, _v, *this));
       return *this;
     }
   private:
     const Graph& _graph;
+    Node _u, _v;
   };