1.1 --- a/src/work/edmonds_karp.h Fri Mar 12 09:19:54 2004 +0000
1.2 +++ b/src/work/edmonds_karp.h Fri Mar 12 09:40:03 2004 +0000
1.3 @@ -464,7 +464,7 @@
1.4 //typedef typename EAugGraph::NodeMap<bool> ReachedMap;
1.5 BfsIterator4<
1.6 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>,
1.7 - ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,
1.8 + typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt,
1.9 ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::NodeMap<bool> > bfs(res_graph);
1.10
1.11 //std::cout << "meg jo2" << std::endl;
1.12 @@ -478,7 +478,7 @@
1.13 //std::cout << "meg jo2.6" << std::endl;
1.14
1.15 while ( !bfs.finished() ) {
1.16 - ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt e=bfs;
1.17 + typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt e=bfs;
1.18 // EAugOutEdgeIt e=/*AugOutEdgeIt*/(bfs);
1.19 //if (res_graph.valid(e)) {
1.20 // std::cout<<"a:"<<res_graph.tail(e)<<"b:"<<res_graph.head(e)<<std::endl;
2.1 --- a/src/work/marci/makefile Fri Mar 12 09:19:54 2004 +0000
2.2 +++ b/src/work/marci/makefile Fri Mar 12 09:40:03 2004 +0000
2.3 @@ -1,4 +1,4 @@
2.4 -CXX3 = g++-3.0
2.5 +CXX3 = g++-3.3
2.6 CXX2 = g++-2.95
2.7 CXX3.3 = g++
2.8 CXXFLAGS = -W -Wall -ansi -pedantic -I. -I.. -I../alpar