diff -r 55b15666560f -r 9d7b12f83daa lemon/lemon_reader.h
--- a/lemon/lemon_reader.h	Tue Oct 31 09:32:44 2006 +0000
+++ b/lemon/lemon_reader.h	Tue Oct 31 14:27:58 2006 +0000
@@ -117,8 +117,8 @@
       }
 
     private:
+      const Graph& graph;
       typename Ref<Map>::Type map;
-      const Graph& graph;
     };
 
     template <typename Graph, typename Map>
@@ -147,8 +147,8 @@
       }
 
     private:
+      const Graph& graph;
       typename Ref<Map>::Type map;
-      const Graph& graph;
     };
 
 
@@ -1377,10 +1377,10 @@
 				    const Reader& reader = Reader()) { 
       checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
       checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
-      readMap("+" + name, 
-	      _reader_bits::forwardComposeMap(graph, map), reader);
-      readMap("-" + name, 
-	      _reader_bits::backwardComposeMap(graph, map), reader);
+      readUEdgeMap("+" + name, 
+                   _reader_bits::forwardComposeMap(graph, map), reader);
+      readUEdgeMap("-" + name, 
+                   _reader_bits::backwardComposeMap(graph, map), reader);
       return *this;      
     }
 
@@ -1391,9 +1391,9 @@
     /// Add a new directed edge map skipper command for the reader.
     template <typename Reader>
     UEdgeSetReader& skipEdgeMap(std::string name, 
-				    const Reader& reader = Reader()) {
-      skipMap("+" + name, reader);
-      skipMap("-" + name, reader);
+                                const Reader& reader = Reader()) {
+      skipUEdgeMap("+" + name, reader);
+      skipUEdgeMap("-" + name, reader);
       return *this;
     }