[Lemon-commits] [lemon_svn] marci: r427 - hugo/trunk/src/work

[Lemon SVN]

Author: marci
Date: Mon Apr  5 19:56:31 2004
New Revision: 427

Modified:
   hugo/trunk/src/work/list_graph.h

Log:
.


Modified: hugo/trunk/src/work/list_graph.h
==============================================================================
--- hugo/trunk/src/work/list_graph.h	(original)
+++ hugo/trunk/src/work/list_graph.h	Mon Apr  5 19:56:31 2004
@@ -233,7 +233,9 @@
     ListGraph() : node_id(0), edge_id(0), _node_num(0), _edge_num(0), _first_node(0), _last_node(0) { }
     
     ~ListGraph() { 
-      while (first<NodeIt>().valid()) erase(first<NodeIt>());
+      NodeIt n;
+      while (this->valid(first(n))) erase(n);
+      //while (first<NodeIt>().valid()) erase(first<NodeIt>());
     }
 
     int nodeNum() const { return _node_num; }
@@ -334,8 +336,16 @@
     }
 
     void erase(Node i) { 
-      while (first<OutEdgeIt>(i).valid()) erase(first<OutEdgeIt>(i));
-      while (first<InEdgeIt>(i).valid()) erase(first<InEdgeIt>(i));
+      { 
+	OutEdgeIt e;
+	while (this->valid(first(e, i))) erase(e);
+      }
+      {
+	InEdgeIt e;
+	while (this->valid(first(e, i))) erase(e);
+      }
+      //while (first<OutEdgeIt>(i).valid()) erase(first<OutEdgeIt>(i));
+      //while (first<InEdgeIt>(i).valid()) erase(first<InEdgeIt>(i));
       _delete_node(i.node); 
     }