diff -r e46a1f0623a0 -r f2994a2b10b2 src/hugo/mincostflows.h
--- a/src/hugo/mincostflows.h	Tue Aug 31 11:26:59 2004 +0000
+++ b/src/hugo/mincostflows.h	Tue Aug 31 13:40:07 2004 +0000
@@ -116,12 +116,12 @@
       //Resetting variables from previous runs
       total_length = 0;
       
-      FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
+      for(typename Graph::EdgeIt e=loopFirst(typename Graph::EdgeIt(), (G)); e!=INVALID; ++e){
 	flow.set(e,0);
       }
 
       //Initialize the potential to zero
-      FOR_EACH_LOC(typename Graph::NodeIt, n, G){
+      for(typename Graph::NodeIt n=loopFirst(typename Graph::NodeIt(), (G)); n!=INVALID; ++n){
 	potential.set(n,0);
       }
       
@@ -144,7 +144,9 @@
 	};
 	
 	//We have to change the potential
-	FOR_EACH_LOC(typename ResGraphType::NodeIt, n, res_graph){
+        //#define FOR_EACH_LOC(Ittype, e, g) for(Ittype e=loopFirst(Ittype(), (g)); (g).valid(e); (g).next(e))
+	//FOR_EACH_LOC(typename ResGraphType::NodeIt, n, res_graph){
+        for(typename ResGraphType::NodeIt n=loopFirst(typename ResGraphType::NodeIt(), (res_graph)); n!=INVALID; ++n){
 	  potential[n] += dijkstra.distMap()[n];
 	}
 
@@ -195,7 +197,9 @@
     bool checkComplementarySlackness(){
       Length mod_pot;
       Length fl_e;
-      FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
+        //#define FOR_EACH_LOC(Ittype, e, g) for(Ittype e=loopFirst(Ittype(), (g)); (g).valid(e); (g).next(e))
+        //FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
+        for(typename Graph::EdgeIt e=loopFirst(typename Graph::EdgeIt(), (G)); e!=INVALID; ++e){
 	//C^{\Pi}_{i,j}
 	mod_pot = length[e]-potential[G.head(e)]+potential[G.tail(e)];
 	fl_e = flow[e];