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

lemon/smart_graph.h

@@ -56 +56 @@
   public:
 
-    typedef SmartDigraphBase Graph;
+    typedef SmartDigraphBase Digraph;
 
     class Node;
@@ -196 +196 @@
   ///\sa concepts::Digraph.
   class SmartDigraph : public ExtendedSmartDigraphBase {
-  public:
-
     typedef ExtendedSmartDigraphBase Parent;
 
@@ -421 +419 @@
   public:
 
-    typedef SmartGraphBase Digraph;
+    typedef SmartGraphBase Graph;
 
     class Node;
@@ -632 +630 @@
   /// \sa concepts::Graph.
   class SmartGraph : public ExtendedSmartGraphBase {
+    typedef ExtendedSmartGraphBase Parent;
+
   private:
 
@@ -648 +648 @@
 
   public:
-
-    typedef ExtendedSmartGraphBase Parent;
 
     /// Constructor