# HG changeset patch # User marci # Date 1079084403 0 # Node ID ebccffe4d47b5ee07fff27727eb35398f4e0cbd3 # Parent 44700ed9ffaa5ded46bdba64f0f80ee83d4a2d7d correcting implicit typenames diff -r 44700ed9ffaa -r ebccffe4d47b src/work/edmonds_karp.h --- a/src/work/edmonds_karp.h Fri Mar 12 09:19:54 2004 +0000 +++ b/src/work/edmonds_karp.h Fri Mar 12 09:40:03 2004 +0000 @@ -464,7 +464,7 @@ //typedef typename EAugGraph::NodeMap<bool> ReachedMap; BfsIterator4< ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>, - ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt, + typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt, ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::NodeMap<bool> > bfs(res_graph); //std::cout << "meg jo2" << std::endl; @@ -478,7 +478,7 @@ //std::cout << "meg jo2.6" << std::endl; while ( !bfs.finished() ) { - ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt e=bfs; + typename ErasingResGraphWrapper<Graph, Number, FlowMap, CapacityMap>::OutEdgeIt e=bfs; // EAugOutEdgeIt e=/*AugOutEdgeIt*/(bfs); //if (res_graph.valid(e)) { // std::cout<<"a:"<<res_graph.tail(e)<<"b:"<<res_graph.head(e)<<std::endl; diff -r 44700ed9ffaa -r ebccffe4d47b src/work/marci/makefile --- a/src/work/marci/makefile Fri Mar 12 09:19:54 2004 +0000 +++ b/src/work/marci/makefile Fri Mar 12 09:40:03 2004 +0000 @@ -1,4 +1,4 @@ -CXX3 = g++-3.0 +CXX3 = g++-3.3 CXX2 = g++-2.95 CXX3.3 = g++ CXXFLAGS = -W -Wall -ansi -pedantic -I. -I.. -I../alpar