Changeset 1990:15fb7a4ea6be in lemon-0.x for lemon/sub_graph.h

Timestamp:

03/01/06 11:17:25 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2592

Message:

Some classes assumed that the GraphMaps? should be inherited
from an ObserverBase?. These classes parents replaced with
DefaultMap? which cause that the graph maps should not be
inherited from the ObserverBase?.

File:

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

lemon/sub_graph.h

@@ -21 +21 @@
 
 #include <lemon/graph_adaptor.h>
+#include <lemon/bits/graph_adaptor_extender.h>
+#include <lemon/bits/default_map.h>
 
 namespace lemon {
@@ -243 +245 @@
       Edge firstIn, firstOut;
     };
-    class NodesImpl : public Graph::template NodeMap<NodeT> {
+    class NodesImpl : public DefaultMap<Graph, Node, NodeT> {
       friend class SubGraphBase;
     public:
-      typedef typename Graph::template NodeMap<NodeT> Parent;
+      typedef DefaultMap<Graph, Node, NodeT> Parent;
 
       NodesImpl(SubGraph& _adaptor, const Graph& _graph) 
@@ -306 +308 @@
       Edge prevIn, nextIn;
     };
-    class EdgesImpl : public Graph::template EdgeMap<EdgeT> {
+    class EdgesImpl : public DefaultMap<Graph, Edge, EdgeT> {
       friend class SubGraphBase;
     public:
-      typedef typename Graph::template EdgeMap<EdgeT> Parent;
+      typedef DefaultMap<Graph, Edge, EdgeT> Parent;
 
       EdgesImpl(SubGraph& _adaptor, const Graph& _graph) 
@@ -561 +563 @@
       Edge firstIn, firstOut;
     };
-    class NodesImpl : public Graph::template NodeMap<NodeT> {
+    class NodesImpl : public DefaultMap<Graph, Node, NodeT> {
       friend class EdgeSubGraphBase;
     public:
-      typedef typename Graph::template NodeMap<NodeT> Parent;
+      typedef DefaultMap<Graph, Node, NodeT> Parent;
 
       NodesImpl(SubGraph& _adaptor, const Graph& _graph) 
@@ -604 +606 @@
       Edge prevIn, nextIn;
     };
-    class EdgesImpl : public Graph::template EdgeMap<EdgeT> {
+    class EdgesImpl : public DefaultMap<Graph, Edge, EdgeT> {
       friend class EdgeSubGraphBase;
     public:
-      typedef typename Graph::template EdgeMap<EdgeT> Parent;
+      typedef DefaultMap<Graph, Edge, EdgeT> Parent;
 
       EdgesImpl(SubGraph& _adaptor, const Graph& _graph)