diff -r ddf25b2fa6ab -r b8d635e1672d src/work/jacint/preflow_res.h --- a/src/work/jacint/preflow_res.h Sat Apr 24 13:24:42 2004 +0000 +++ b/src/work/jacint/preflow_res.h Sat Apr 24 14:25:03 2004 +0000 @@ -15,8 +15,8 @@ namespace hugo { template , - typename FlowMap=typename Graph::EdgeMap > + typename CapMap=typename Graph::template EdgeMap, + typename FlowMap=typename Graph::template EdgeMap > class PreflowRes { typedef typename Graph::Node Node; @@ -69,16 +69,16 @@ int k=n-2; //bound on the highest level under n containing a node int b=k; //bound on the highest level under n of an active node - typename Graph::NodeMap level(G,n); - typename Graph::NodeMap excess(G); + typename Graph::template NodeMap level(G,n); + typename Graph::template NodeMap excess(G); std::vector active(n-1,INVALID); - typename Graph::NodeMap next(G,INVALID); + typename Graph::template NodeMap next(G,INVALID); //Stack of the active nodes in level i < n. //We use it in both phases. - typename Graph::NodeMap left(G,INVALID); - typename Graph::NodeMap right(G,INVALID); + typename Graph::template NodeMap left(G,INVALID); + typename Graph::template NodeMap right(G,INVALID); std::vector level_list(n,INVALID); /* List of the nodes in level i