diff -r 94387da47f79 -r c5fd2d996909 lemon/lgf_reader.h
--- a/lemon/lgf_reader.h	Thu Mar 05 10:13:20 2009 +0000
+++ b/lemon/lgf_reader.h	Sun Mar 29 23:08:20 2009 +0200
@@ -448,16 +448,16 @@
   /// It is impossible to read this in
   /// a single pass, because the arcs are not constructed when the node
   /// maps are read.
-  template <typename _Digraph>
+  template <typename GR>
   class DigraphReader {
   public:
 
-    typedef _Digraph Digraph;
+    typedef GR Digraph;
+
+  private:
+
     TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
 
-  private:
-
-
     std::istream* _is;
     bool local_is;
     std::string _filename;
@@ -1246,15 +1246,16 @@
   /// prefixed with \c '+' and \c '-', then these can be read into an
   /// arc map.  Similarly, an attribute can be read into an arc, if
   /// it's value is an edge label prefixed with \c '+' or \c '-'.
-  template <typename _Graph>
+  template <typename GR>
   class GraphReader {
   public:
 
-    typedef _Graph Graph;
+    typedef GR Graph;
+
+  private:
+
     TEMPLATE_GRAPH_TYPEDEFS(Graph);
 
-  private:
-
     std::istream* _is;
     bool local_is;
     std::string _filename;
@@ -1356,12 +1357,12 @@
     }
 
   private:
-    template <typename GR>
-    friend GraphReader<GR> graphReader(GR& graph, std::istream& is);
-    template <typename GR>
-    friend GraphReader<GR> graphReader(GR& graph, const std::string& fn); 
-    template <typename GR>
-    friend GraphReader<GR> graphReader(GR& graph, const char *fn);
+    template <typename Graph>
+    friend GraphReader<Graph> graphReader(Graph& graph, std::istream& is);
+    template <typename Graph>
+    friend GraphReader<Graph> graphReader(Graph& graph, const std::string& fn); 
+    template <typename Graph>
+    friend GraphReader<Graph> graphReader(Graph& graph, const char *fn);
 
     GraphReader(GraphReader& other)
       : _is(other._is), local_is(other.local_is), _graph(other._graph),