1.1 --- a/lemon/lgf_writer.h	Thu Mar 05 10:13:20 2009 +0000
     1.2 +++ b/lemon/lgf_writer.h	Sun Mar 29 23:08:20 2009 +0200
     1.3 @@ -406,11 +406,11 @@
     1.4    /// section to the stream. The output stream can be retrieved with
     1.5    /// the \c ostream() function, hence the second pass can append its
     1.6    /// output to the output of the first pass.
     1.7 -  template <typename _Digraph>
     1.8 +  template <typename GR>
     1.9    class DigraphWriter {
    1.10    public:
    1.11  
    1.12 -    typedef _Digraph Digraph;
    1.13 +    typedef GR Digraph;
    1.14      TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
    1.15  
    1.16    private:
    1.17 @@ -974,11 +974,11 @@
    1.18    /// '+' and \c '-'. The arcs are written into the \c \@attributes
    1.19    /// section as a \c '+' or a \c '-' prefix (depends on the direction
    1.20    /// of the arc) and the label of corresponding edge.
    1.21 -  template <typename _Graph>
    1.22 +  template <typename GR>
    1.23    class GraphWriter {
    1.24    public:
    1.25  
    1.26 -    typedef _Graph Graph;
    1.27 +    typedef GR Graph;
    1.28      TEMPLATE_GRAPH_TYPEDEFS(Graph);
    1.29  
    1.30    private:
    1.31 @@ -1073,15 +1073,15 @@
    1.32  
    1.33    private:
    1.34  
    1.35 -    template <typename GR>
    1.36 -    friend GraphWriter<GR> graphWriter(const GR& graph,
    1.37 -                                       std::ostream& os);
    1.38 -    template <typename GR>
    1.39 -    friend GraphWriter<GR> graphWriter(const GR& graph,
    1.40 -                                       const std::string& fn);
    1.41 -    template <typename GR>
    1.42 -    friend GraphWriter<GR> graphWriter(const GR& graph,
    1.43 -                                       const char *fn);
    1.44 +    template <typename Graph>
    1.45 +    friend GraphWriter<Graph> graphWriter(const Graph& graph,
    1.46 +                                          std::ostream& os);
    1.47 +    template <typename Graph>
    1.48 +    friend GraphWriter<Graph> graphWriter(const Graph& graph,
    1.49 +                                          const std::string& fn);
    1.50 +    template <typename Graph>
    1.51 +    friend GraphWriter<Graph> graphWriter(const Graph& graph,
    1.52 +                                          const char *fn);
    1.53      
    1.54      GraphWriter(GraphWriter& other)
    1.55        : _os(other._os), local_os(other.local_os), _graph(other._graph),