diff -r 096d83158d41 -r 81b47fc5c444 lemon/graph_reader.h
--- a/lemon/graph_reader.h	Fri Mar 02 17:56:22 2007 +0000
+++ b/lemon/graph_reader.h	Fri Mar 02 18:04:28 2007 +0000
@@ -184,27 +184,27 @@
     /// \brief Give a new node map reading command to the reader.
     ///
     /// Give a new node map reading command to the reader.
-    template <typename Reader, typename Map>
+    template <typename ItemReader, typename Map>
     GraphReader& readNodeMap(std::string name, Map& map, 
-			     const Reader& reader = Reader()) {
-      nodeset_reader.readNodeMap(name, map, reader);
+			     const ItemReader& ir = ItemReader()) {
+      nodeset_reader.readNodeMap(name, map, ir);
       return *this;
     }
 
-    template <typename Reader, typename Map>
+    template <typename ItemReader, typename Map>
     GraphReader& readNodeMap(std::string name, const Map& map, 
-			     const Reader& reader = Reader()) {
-      nodeset_reader.readNodeMap(name, map, reader);
+			     const ItemReader& ir = ItemReader()) {
+      nodeset_reader.readNodeMap(name, map, ir);
       return *this;
     }
 
     /// \brief Give a new node map skipping command to the reader.
     ///
     /// Give a new node map skipping command to the reader.
-    template <typename Reader>
+    template <typename ItemReader>
     GraphReader& skipNodeMap(std::string name, 
-			     const Reader& reader = Reader()) {
-      nodeset_reader.skipNodeMap(name, reader);
+			     const ItemReader& ir = ItemReader()) {
+      nodeset_reader.skipNodeMap(name, ir);
       return *this;
     }
 
@@ -227,27 +227,27 @@
     /// \brief Give a new edge map reading command to the reader.
     ///
     /// Give a new edge map reading command to the reader.
-    template <typename Reader, typename Map>
+    template <typename ItemReader, typename Map>
     GraphReader& readEdgeMap(std::string name, Map& map,
-			     const Reader& reader = Reader()) {
-      edgeset_reader.readEdgeMap(name, map, reader);
+			     const ItemReader& ir = ItemReader()) {
+      edgeset_reader.readEdgeMap(name, map, ir);
       return *this;
     }
 
-    template <typename Reader, typename Map>
+    template <typename ItemReader, typename Map>
     GraphReader& readEdgeMap(std::string name, const Map& map,
-			     const Reader& reader = Reader()) {
-      edgeset_reader.readEdgeMap(name, map, reader);
+			     const ItemReader& ir = ItemReader()) {
+      edgeset_reader.readEdgeMap(name, map, ir);
       return *this;
     }
 
     /// \brief Give a new edge map skipping command to the reader.
     ///
     /// Give a new edge map skipping command to the reader.
-    template <typename Reader>
+    template <typename ItemReader>
     GraphReader& skipEdgeMap(std::string name, 
-			     const Reader& reader = Reader()) {
-      edgeset_reader.skipEdgeMap(name, reader);
+			     const ItemReader& ir = ItemReader()) {
+      edgeset_reader.skipEdgeMap(name, ir);
       return *this;
     }
 
@@ -279,10 +279,10 @@
     /// \brief Give a new attribute reading command.
     ///
     ///  Give a new attribute reading command.
-    template <typename Reader, typename Value>
+    template <typename ItemReader, typename Value>
     GraphReader& readAttribute(std::string name, Value& value, 
-			       const Reader& reader) {
-      attribute_reader.readAttribute<Reader>(name, value, reader);
+			       const ItemReader& ir = ItemReader()) {
+      attribute_reader.readAttribute(name, value, ir);
       return *this;
     }
 
@@ -504,27 +504,27 @@
     /// \brief Give a new node map reading command to the reader.
     ///
     /// Give a new node map reading command to the reader.
-    template <typename Reader, typename Map>
+    template <typename ItemReader, typename Map>
     UGraphReader& readNodeMap(std::string name, Map& map, 
-				  const Reader& reader = Reader()) {
-      nodeset_reader.readNodeMap(name, map, reader);
+                              const ItemReader& ir = ItemReader()) {
+      nodeset_reader.readNodeMap(name, map, ir);
       return *this;
     }
 
-    template <typename Reader, typename Map>
+    template <typename ItemReader, typename Map>
     UGraphReader& readNodeMap(std::string name, const Map& map, 
-				  const Reader& reader = Reader()) {
-      nodeset_reader.readNodeMap(name, map, reader);
+                              const ItemReader& ir = ItemReader()) {
+      nodeset_reader.readNodeMap(name, map, ir);
       return *this;
     }
 
     /// \brief Give a new node map skipping command to the reader.
     ///
     /// Give a new node map skipping command to the reader.
-    template <typename Reader>
+    template <typename ItemReader>
     UGraphReader& skipNodeMap(std::string name, 
-			     const Reader& reader = Reader()) {
-      nodeset_reader.skipNodeMap(name, reader);
+                              const ItemReader& ir = ItemReader()) {
+      nodeset_reader.skipNodeMap(name, ir);
       return *this;
     }
 
@@ -547,27 +547,27 @@
     /// \brief Give a new undirected edge map reading command to the reader.
     ///
     /// Give a new undirected edge map reading command to the reader.
-    template <typename Reader, typename Map>
+    template <typename ItemReader, typename Map>
     UGraphReader& readUEdgeMap(std::string name, Map& map,
-				       const Reader& reader = Reader()) {
-      u_edgeset_reader.readUEdgeMap(name, map, reader);
+                               const ItemReader& ir = ItemReader()) {
+      u_edgeset_reader.readUEdgeMap(name, map, ir);
       return *this;
     }
 
-    template <typename Reader, typename Map>
+    template <typename ItemReader, typename Map>
     UGraphReader& readUEdgeMap(std::string name, const Map& map,
-				       const Reader& reader = Reader()) {
-      u_edgeset_reader.readUEdgeMap(name, map, reader);
+                               const ItemReader& ir = ItemReader()) {
+      u_edgeset_reader.readUEdgeMap(name, map, ir);
       return *this;
     }
 
     /// \brief Give a new undirected edge map skipping command to the reader.
     ///
     /// Give a new undirected edge map skipping command to the reader.
-    template <typename Reader>
+    template <typename ItemReader>
     UGraphReader& skipUEdgeMap(std::string name,
-				       const Reader& reader = Reader()) {
-      u_edgeset_reader.skipUMap(name, reader);
+				       const ItemReader& ir = ItemReader()) {
+      u_edgeset_reader.skipUMap(name, ir);
       return *this;
     }
 
@@ -591,27 +591,27 @@
     /// \brief Give a new edge map reading command to the reader.
     ///
     /// Give a new edge map reading command to the reader.
-    template <typename Reader, typename Map>
+    template <typename ItemReader, typename Map>
     UGraphReader& readEdgeMap(std::string name, Map& map,
-				       const Reader& reader = Reader()) {
-      u_edgeset_reader.readEdgeMap(name, map, reader);
+                              const ItemReader& ir = ItemReader()) {
+      u_edgeset_reader.readEdgeMap(name, map, ir);
       return *this;
     }
 
-    template <typename Reader, typename Map>
+    template <typename ItemReader, typename Map>
     UGraphReader& readEdgeMap(std::string name, const Map& map,
-				       const Reader& reader = Reader()) {
-      u_edgeset_reader.readEdgeMap(name, map, reader);
+                              const ItemReader& ir = ItemReader()) {
+      u_edgeset_reader.readEdgeMap(name, map, ir);
       return *this;
     }
 
     /// \brief Give a new edge map skipping command to the reader.
     ///
     /// Give a new edge map skipping command to the reader.
-    template <typename Reader>
+    template <typename ItemReader>
     UGraphReader& skipEdgeMap(std::string name,
-				       const Reader& reader = Reader()) {
-      u_edgeset_reader.skipEdgeMap(name, reader);
+                              const ItemReader& ir = ItemReader()) {
+      u_edgeset_reader.skipEdgeMap(name, ir);
       return *this;
     }
 
@@ -650,10 +650,10 @@
     /// \brief Give a new attribute reading command.
     ///
     ///  Give a new attribute reading command.
-    template <typename Reader, typename Value>
+    template <typename ItemReader, typename Value>
     UGraphReader& readAttribute(std::string name, Value& value, 
-			       const Reader& reader) {
-      attribute_reader.readAttribute<Reader>(name, value, reader);
+			       const ItemReader& ir = ItemReader()) {
+      attribute_reader.readAttribute(name, value, ir);
       return *this;
     }