diff -r 1b41ebb5fee5 -r 769f31e9f7b0 src/work/alpar/list_graph.h
--- a/src/work/alpar/list_graph.h	Fri Apr 30 19:02:40 2004 +0000
+++ b/src/work/alpar/list_graph.h	Mon May 03 07:27:29 2004 +0000
@@ -316,7 +316,7 @@
       Node(int nn) {n=nn;}
     public:
       Node() {}
-      Node (Invalid i) { n=-1; }
+      Node (Invalid) { n=-1; }
       bool operator==(const Node i) const {return n==i.n;}
       bool operator!=(const Node i) const {return n!=i.n;}
       bool operator<(const Node i) const {return n<i.n;}
@@ -503,7 +503,7 @@
       EdgeMap(const EdgeMap<T> &m) :
  	DynMapBase<Edge>(*m.G), container(m.container)
       {
- 	G->dyn_node_maps.push_back(this);
+ 	G->dyn_edge_maps.push_back(this);
       }
 
       template<typename TT> friend class EdgeMap;
@@ -513,7 +513,7 @@
       template<typename TT> EdgeMap(const EdgeMap<TT> &m) :
 	DynMapBase<Edge>(*m.G)
       {
-	G->dyn_node_maps.push_back(this);
+	G->dyn_edge_maps.push_back(this);
 	typename std::vector<TT>::const_iterator i;
 	for(typename std::vector<TT>::const_iterator i=m.container.begin();
 	    i!=m.container.end();
@@ -1294,11 +1294,11 @@
 	it.n=edges[it.n].next_in;
       }
       else {
-	typename NodeGraphType::Node n;
-	for(n=G.next(edges[it.n].head);
-	    G.valid(n) && nodes[n].first_in == -1;
-	    G.next(n)) ;
-	it.n = (G.valid(n))?-1:nodes[n].first_in;
+	NodeIt n;
+	for(n=next(edges[it.n].head);
+	    valid(n) && nodes[n].first_in == -1;
+	    next(n)) ;
+	it.n = (valid(n))?-1:nodes[n].first_in;
       }
       return it;
     }
@@ -1385,6 +1385,7 @@
 //       first_node=first_free_node=first_free_edge=-1;
 //     }
 
+  public:
     class Node : public NodeGraphType::Node {
       friend class EdgeSet;
       //      template <typename T> friend class NodeMap;
@@ -1444,10 +1445,11 @@
       friend class EdgeSet;
     public:
       EdgeIt(const EdgeSet& G) : Edge() {
-      	typename NodeGraphType::Node m;
+	//      	typename NodeGraphType::Node m;
+        NodeIt m;
 	for(G.first(m);
-	    G.valid(m) && nodes[m].first_in == -1;  G.next[m]);
-	n = G.valid(m)?-1:nodes[m].first_in;
+	    G.valid(m) && G.nodes[m].first_in == -1;  G.next(m));
+	n = G.valid(m)?-1:G.nodes[m].first_in;
       }
       EdgeIt (Invalid i) : Edge(i) { }
       EdgeIt() : Edge() { }
@@ -1514,7 +1516,7 @@
       EdgeMap(const EdgeMap<T> &m) :
  	DynMapBase<Edge>(*m.G), container(m.container)
       {
- 	G->dyn_node_maps.push_back(this);
+ 	G->dyn_edge_maps.push_back(this);
       }
 
       template<typename TT> friend class EdgeMap;
@@ -1524,7 +1526,7 @@
       template<typename TT> EdgeMap(const EdgeMap<TT> &m) :
 	DynMapBase<Edge>(*m.G)
       {
-	G->dyn_node_maps.push_back(this);
+	G->dyn_edge_maps.push_back(this);
 	typename std::vector<TT>::const_iterator i;
 	for(typename std::vector<TT>::const_iterator i=m.container.begin();
 	    i!=m.container.end();