1.1 --- a/src/work/marci/edmonds_karp_demo.cc	Mon Apr 05 17:10:25 2004 +0000
     1.2 +++ b/src/work/marci/edmonds_karp_demo.cc	Mon Apr 05 17:25:40 2004 +0000
     1.3 @@ -3,7 +3,7 @@
     1.4  #include <fstream>
     1.5  
     1.6  #include <list_graph.h>
     1.7 -//#include <smart_graph.h>
     1.8 +#include <smart_graph.h>
     1.9  #include <dimacs.h>
    1.10  #include <edmonds_karp.h>
    1.11  #include <time_measure.h>
    1.12 @@ -39,8 +39,8 @@
    1.13  
    1.14    typedef ListGraph MutableGraph;
    1.15  
    1.16 -  //typedef SmartGraph Graph;
    1.17 -  typedef ListGraph Graph;
    1.18 +  typedef SmartGraph Graph;
    1.19 +  //typedef ListGraph Graph;
    1.20    typedef Graph::Node Node;
    1.21    typedef Graph::EdgeIt EdgeIt;
    1.22  

     2.1 --- a/src/work/marci/graph_wrapper.h	Mon Apr 05 17:10:25 2004 +0000
     2.2 +++ b/src/work/marci/graph_wrapper.h	Mon Apr 05 17:25:40 2004 +0000
     2.3 @@ -714,7 +714,7 @@
     2.4        return e;
     2.5      }
     2.6  
     2.7 -    template<typename I> I& next(I &i) const { return graph->next(i); }    
     2.8 +    template<typename I> I& next(I &i) const { graph->next(i); return i; }    
     2.9  //    template<typename I> I getNext(const I& i) const { return gw.getNext(i); }
    2.10  
    2.11      template< typename It > It first() const { 
    2.12 @@ -1004,7 +1004,7 @@
    2.13        return e;
    2.14      }
    2.15     
    2.16 -    NodeIt& next(NodeIt& n) const { return graph->next(n); }
    2.17 +    NodeIt& next(NodeIt& n) const { graph->next(n); return n; }
    2.18  
    2.19      OutEdgeIt& next(OutEdgeIt& e) const { 
    2.20        if (e.out_or_in) {