G++-3.3 conform solution
authordeba
Thu, 11 Jan 2007 21:58:30 +0000
changeset 234321587bc5922b
parent 2342 4dd3eb348641
child 2344 48ecc4feb42b
G++-3.3 conform solution
lemon/list_graph.h
lemon/smart_graph.h
     1.1 --- a/lemon/list_graph.h	Thu Jan 11 21:35:14 2007 +0000
     1.2 +++ b/lemon/list_graph.h	Thu Jan 11 21:58:30 2007 +0000
     1.3 @@ -747,6 +747,10 @@
     1.4    public:
     1.5      
     1.6      typedef ListUGraphBase Graph;
     1.7 +
     1.8 +    class Node;
     1.9 +    class Edge;
    1.10 +    class UEdge;
    1.11      
    1.12      class Node {
    1.13        friend class ListUGraphBase;
    1.14 @@ -765,7 +769,6 @@
    1.15  
    1.16      class UEdge {
    1.17        friend class ListUGraphBase;
    1.18 -      friend class ListUGraphBase::Edge;
    1.19      protected:
    1.20  
    1.21        int id;
    1.22 @@ -787,7 +790,7 @@
    1.23        explicit Edge(int pid) { id = pid;}
    1.24  
    1.25      public:
    1.26 -      operator UEdge() const { return UEdge(id / 2); }
    1.27 +      operator UEdge() const { return uEdgeFromId(id / 2); }
    1.28  
    1.29        Edge() {}
    1.30        Edge (Invalid) { id = -1; }
     2.1 --- a/lemon/smart_graph.h	Thu Jan 11 21:35:14 2007 +0000
     2.2 +++ b/lemon/smart_graph.h	Thu Jan 11 21:58:30 2007 +0000
     2.3 @@ -409,7 +409,6 @@
     2.4  
     2.5      class UEdge {
     2.6        friend class SmartUGraphBase;
     2.7 -      friend class SmartUGraphBase::Edge;
     2.8      protected:
     2.9  
    2.10        int id;
    2.11 @@ -431,7 +430,7 @@
    2.12        explicit Edge(int pid) { id = pid;}
    2.13  
    2.14      public:
    2.15 -      operator UEdge() const { return UEdge(id / 2); }
    2.16 +      operator UEdge() const { return uEdgeFromId(id / 2); }
    2.17  
    2.18        Edge() {}
    2.19        Edge (Invalid) { id = -1; }