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

lemon/full_graph.h

@@ -32 +32 @@
   public:
 
-    typedef FullDigraphBase Graph;
+    typedef FullDigraphBase Digraph;
 
     class Node;
@@ -170 +170 @@
   /// \sa FullGraph
   class FullDigraph : public ExtendedFullDigraphBase {
+    typedef ExtendedFullDigraphBase Parent;
+
   public:
-
-    typedef ExtendedFullDigraphBase Parent;
 
     /// \brief Constructor
@@ -227 +227 @@
 
   class FullGraphBase {
-    int _node_num;
-    int _edge_num;
   public:
 
@@ -238 +236 @@
 
   protected:
+
+    int _node_num;
+    int _edge_num;
 
     FullGraphBase() {}
@@ -538 +539 @@
   /// \sa FullDigraph
   class FullGraph : public ExtendedFullGraphBase {
+    typedef ExtendedFullGraphBase Parent;
+
   public:
-
-    typedef ExtendedFullGraphBase Parent;
 
     /// \brief Constructor