Changeset 652:4dfa1f79bf3e in lemon-0.x for src/work/marci

Timestamp:

05/20/04 19:21:55 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

misc

Location:

src/work/marci

Files:

• graph_concept.h (modified) (1 diff)
• max_flow_demo.cc (modified) (1 diff)

src/work/marci/graph_concept.h

@@ -457 +457 @@
   };
 
-  class FullFeatureGraphConcept : public NodeIterableGraphConcept,
-                                  public EdgeIterableGraphConcept, 
-                                  public OutEdgeIterableGraphConcept, 
-                                  public InEdgeIterableGraphConcept {
+  class FullFeatureGraphConcept : virtual public NodeIterableGraphConcept,
+                                  virtual public EdgeIterableGraphConcept, 
+                                  virtual public OutEdgeIterableGraphConcept, 
+                                  virtual public InEdgeIterableGraphConcept, 
+                                  virtual public NodeCountingGraphConcept {
   public:
     FullFeatureGraphConcept() { }
+    using EdgeIterableGraphConcept::next;
+    using NodeIterableGraphConcept::next;
+    using OutEdgeIterableGraphConcept::next;    
+    using InEdgeIterableGraphConcept::next;
   };
   

src/work/marci/max_flow_demo.cc

@@ -67 +67 @@
 
   Graph g;
+
   Node s, t;
   Graph::EdgeMap<int> cap(g);