1.1 --- a/lemon/lemon_reader.h	Tue Oct 31 09:32:44 2006 +0000
     1.2 +++ b/lemon/lemon_reader.h	Tue Oct 31 14:27:58 2006 +0000
     1.3 @@ -117,8 +117,8 @@
     1.4        }
     1.5  
     1.6      private:
     1.7 +      const Graph& graph;
     1.8        typename Ref<Map>::Type map;
     1.9 -      const Graph& graph;
    1.10      };
    1.11  
    1.12      template <typename Graph, typename Map>
    1.13 @@ -147,8 +147,8 @@
    1.14        }
    1.15  
    1.16      private:
    1.17 +      const Graph& graph;
    1.18        typename Ref<Map>::Type map;
    1.19 -      const Graph& graph;
    1.20      };
    1.21  
    1.22  
    1.23 @@ -1377,10 +1377,10 @@
    1.24  				    const Reader& reader = Reader()) { 
    1.25        checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
    1.26        checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
    1.27 -      readMap("+" + name, 
    1.28 -	      _reader_bits::forwardComposeMap(graph, map), reader);
    1.29 -      readMap("-" + name, 
    1.30 -	      _reader_bits::backwardComposeMap(graph, map), reader);
    1.31 +      readUEdgeMap("+" + name, 
    1.32 +                   _reader_bits::forwardComposeMap(graph, map), reader);
    1.33 +      readUEdgeMap("-" + name, 
    1.34 +                   _reader_bits::backwardComposeMap(graph, map), reader);
    1.35        return *this;      
    1.36      }
    1.37  
    1.38 @@ -1391,9 +1391,9 @@
    1.39      /// Add a new directed edge map skipper command for the reader.
    1.40      template <typename Reader>
    1.41      UEdgeSetReader& skipEdgeMap(std::string name, 
    1.42 -				    const Reader& reader = Reader()) {
    1.43 -      skipMap("+" + name, reader);
    1.44 -      skipMap("-" + name, reader);
    1.45 +                                const Reader& reader = Reader()) {
    1.46 +      skipUEdgeMap("+" + name, reader);
    1.47 +      skipUEdgeMap("-" + name, reader);
    1.48        return *this;
    1.49      }
    1.50