[Lemon-commits] deba: r3135 - hugo/trunk/lemon

[Lemon SVN]

Author: deba
Date: Thu Jan 11 22:58:30 2007
New Revision: 3135

Modified:
   hugo/trunk/lemon/list_graph.h
   hugo/trunk/lemon/smart_graph.h

Log:
G++-3.3 conform solution



Modified: hugo/trunk/lemon/list_graph.h
==============================================================================
--- hugo/trunk/lemon/list_graph.h	(original)
+++ hugo/trunk/lemon/list_graph.h	Thu Jan 11 22:58:30 2007
@@ -747,6 +747,10 @@
   public:
     
     typedef ListUGraphBase Graph;
+
+    class Node;
+    class Edge;
+    class UEdge;
     
     class Node {
       friend class ListUGraphBase;
@@ -765,7 +769,6 @@
 
     class UEdge {
       friend class ListUGraphBase;
-      friend class ListUGraphBase::Edge;
     protected:
 
       int id;
@@ -787,7 +790,7 @@
       explicit Edge(int pid) { id = pid;}
 
     public:
-      operator UEdge() const { return UEdge(id / 2); }
+      operator UEdge() const { return uEdgeFromId(id / 2); }
 
       Edge() {}
       Edge (Invalid) { id = -1; }

Modified: hugo/trunk/lemon/smart_graph.h
==============================================================================
--- hugo/trunk/lemon/smart_graph.h	(original)
+++ hugo/trunk/lemon/smart_graph.h	Thu Jan 11 22:58:30 2007
@@ -409,7 +409,6 @@
 
     class UEdge {
       friend class SmartUGraphBase;
-      friend class SmartUGraphBase::Edge;
     protected:
 
       int id;
@@ -431,7 +430,7 @@
       explicit Edge(int pid) { id = pid;}
 
     public:
-      operator UEdge() const { return UEdge(id / 2); }
+      operator UEdge() const { return uEdgeFromId(id / 2); }
 
       Edge() {}
       Edge (Invalid) { id = -1; }