Changeset 664:4137ef9aacc6 in lemon for lemon/maps.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/maps.h (modified) (5 diffs)

lemon/maps.h

@@ -1839 +1839 @@
     /// The graph type of IdMap.
     typedef GR Graph;
+    typedef GR Digraph;
     /// The key type of IdMap (\c Node, \c Arc or \c Edge).
     typedef K Item;
@@ -1930 +1931 @@
     /// The graph type of CrossRefMap.
     typedef GR Graph;
+    typedef GR Digraph;
     /// The key type of CrossRefMap (\c Node, \c Arc or \c Edge).
     typedef K Item;
@@ -2133 +2135 @@
     /// The graph type of RangeIdMap.
     typedef GR Graph;
+    typedef GR Digraph;
     /// The key type of RangeIdMap (\c Node, \c Arc or \c Edge).
     typedef K Item;
@@ -2495 +2498 @@
   public:
     
-    /// The digraph type
+    /// The graph type of InDegMap
+    typedef GR Graph;
     typedef GR Digraph;
     /// The key type
@@ -2624 +2628 @@
   public:
 
-    /// The digraph type
+    /// The graph type of OutDegMap
+    typedef GR Graph;
     typedef GR Digraph;
     /// The key type