Index: src/work/marci/edmonds_karp_demo.cc
===================================================================
--- src/work/marci/edmonds_karp_demo.cc	(revision 303)
+++ src/work/marci/edmonds_karp_demo.cc	(revision 305)
@@ -4,5 +4,5 @@
 
 #include <list_graph.h>
-//#include <smart_graph.h>
+#include <smart_graph.h>
 #include <dimacs.h>
 #include <edmonds_karp.h>
@@ -40,6 +40,6 @@
   typedef ListGraph MutableGraph;
 
-  //typedef SmartGraph Graph;
-  typedef ListGraph Graph;
+  typedef SmartGraph Graph;
+  //typedef ListGraph Graph;
   typedef Graph::Node Node;
   typedef Graph::EdgeIt EdgeIt;
Index: src/work/marci/graph_wrapper.h
===================================================================
--- src/work/marci/graph_wrapper.h	(revision 303)
+++ src/work/marci/graph_wrapper.h	(revision 305)
@@ -715,5 +715,5 @@
     }
 
-    template<typename I> I& next(I &i) const { return graph->next(i); }    
+    template<typename I> I& next(I &i) const { graph->next(i); return i; }    
 //    template<typename I> I getNext(const I& i) const { return gw.getNext(i); }
 
@@ -1005,5 +1005,5 @@
     }
    
-    NodeIt& next(NodeIt& n) const { return graph->next(n); }
+    NodeIt& next(NodeIt& n) const { graph->next(n); return n; }
 
     OutEdgeIt& next(OutEdgeIt& e) const {