Changeset 617:4137ef9aacc6 in lemon-1.2 for lemon/list_graph.h

Timestamp:

04/24/09 11:54:48 (15 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Fix and uniform the usage of Graph and Parent typedefs (#268)

• Rename Graph typedefs to GraphType? in the implementation of graph maps and MapExtender? to prevent conflicts (especially using VS). They are not public.
• Make Parent typedefs private in all classes.
• Replace Digraph with Graph in some places (fix faulty renamings of the script).
• Use Graph and Digraph typedefs (more) consequently.

File:

• lemon/list_graph.h (modified) (5 diffs)

lemon/list_graph.h

@@ -324 +324 @@
 
   class ListDigraph : public ExtendedListDigraphBase {
+    typedef ExtendedListDigraphBase Parent;
+
   private:
     ///ListDigraph is \e not copy constructible. Use copyDigraph() instead.
@@ -337 +339 @@
     void operator=(const ListDigraph &) {}
   public:
-
-    typedef ExtendedListDigraphBase Parent;
 
     /// Constructor
@@ -794 +794 @@
   public:
 
-    typedef ListGraphBase Digraph;
+    typedef ListGraphBase Graph;
 
     class Node;
@@ -1177 +1177 @@
 
   class ListGraph : public ExtendedListGraphBase {
+    typedef ExtendedListGraphBase Parent;
+
   private:
     ///ListGraph is \e not copy constructible. Use copyGraph() instead.
@@ -1195 +1197 @@
     ///
     ListGraph() {}
-
-    typedef ExtendedListGraphBase Parent;
 
     typedef Parent::OutArcIt IncEdgeIt;