# HG changeset patch
# User marci
# Date 1085073715 0
# Node ID 4dfa1f79bf3e1e1297b160f06442bbfd213b751a
# Parent  a56e043aeab10daeba2f258cf1c9b890df3a9704
misc

diff -r a56e043aeab1 -r 4dfa1f79bf3e src/work/marci/graph_concept.h
--- a/src/work/marci/graph_concept.h	Thu May 20 16:57:18 2004 +0000
+++ b/src/work/marci/graph_concept.h	Thu May 20 17:21:55 2004 +0000
@@ -456,12 +456,17 @@
     int edgeNum() const { return 0; }
   };
 
-  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;
   };
   
   /// @}
diff -r a56e043aeab1 -r 4dfa1f79bf3e src/work/marci/max_flow_demo.cc
--- a/src/work/marci/max_flow_demo.cc	Thu May 20 16:57:18 2004 +0000
+++ b/src/work/marci/max_flow_demo.cc	Thu May 20 17:21:55 2004 +0000
@@ -66,6 +66,7 @@
 
 
   Graph g;
+
   Node s, t;
   Graph::EdgeMap<int> cap(g);
   //readDimacsMaxFlow(std::cin, g, s, t, cap);