1.1 --- a/src/work/marci/graph_concept.h	Thu May 20 16:57:18 2004 +0000
     1.2 +++ b/src/work/marci/graph_concept.h	Thu May 20 17:21:55 2004 +0000
     1.3 @@ -456,12 +456,17 @@
     1.4      int edgeNum() const { return 0; }
     1.5    };
     1.6  
     1.7 -  class FullFeatureGraphConcept : public NodeIterableGraphConcept,
     1.8 -				  public EdgeIterableGraphConcept, 
     1.9 -				  public OutEdgeIterableGraphConcept, 
    1.10 -				  public InEdgeIterableGraphConcept {
    1.11 +  class FullFeatureGraphConcept : virtual public NodeIterableGraphConcept,
    1.12 +				  virtual public EdgeIterableGraphConcept, 
    1.13 +				  virtual public OutEdgeIterableGraphConcept, 
    1.14 +				  virtual public InEdgeIterableGraphConcept, 
    1.15 +				  virtual public NodeCountingGraphConcept {
    1.16    public:
    1.17      FullFeatureGraphConcept() { }
    1.18 +    using EdgeIterableGraphConcept::next;
    1.19 +    using NodeIterableGraphConcept::next;
    1.20 +    using OutEdgeIterableGraphConcept::next;    
    1.21 +    using InEdgeIterableGraphConcept::next;
    1.22    };
    1.23    
    1.24    /// @}

     2.1 --- a/src/work/marci/max_flow_demo.cc	Thu May 20 16:57:18 2004 +0000
     2.2 +++ b/src/work/marci/max_flow_demo.cc	Thu May 20 17:21:55 2004 +0000
     2.3 @@ -66,6 +66,7 @@
     2.4  
     2.5  
     2.6    Graph g;
     2.7 +
     2.8    Node s, t;
     2.9    Graph::EdgeMap<int> cap(g);
    2.10    //readDimacsMaxFlow(std::cin, g, s, t, cap);