[Lemon-commits] [lemon_svn] marci: r251 - in hugo/trunk/src/work: . marci

[Lemon SVN]

Author: marci
Date: Fri Mar 12 10:40:03 2004
New Revision: 251

Modified:
   hugo/trunk/src/work/edmonds_karp.h
   hugo/trunk/src/work/marci/makefile

Log:
correcting implicit typenames


Modified: hugo/trunk/src/work/edmonds_karp.h
==============================================================================
--- hugo/trunk/src/work/edmonds_karp.h	(original)
+++ hugo/trunk/src/work/edmonds_karp.h	Fri Mar 12 10:40:03 2004
@@ -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;

Modified: hugo/trunk/src/work/marci/makefile
==============================================================================
--- hugo/trunk/src/work/marci/makefile	(original)
+++ hugo/trunk/src/work/marci/makefile	Fri Mar 12 10:40:03 2004
@@ -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