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

[Lemon SVN]

Author: marci
Date: Sat Apr 24 16:25:03 2004
New Revision: 523

Modified:
   hugo/trunk/src/work/jacint/preflow_res.h
   hugo/trunk/src/work/makefile

Log:
g++-4.0


Modified: hugo/trunk/src/work/jacint/preflow_res.h
==============================================================================
--- hugo/trunk/src/work/jacint/preflow_res.h	(original)
+++ hugo/trunk/src/work/jacint/preflow_res.h	Sat Apr 24 16:25:03 2004
@@ -15,8 +15,8 @@
 namespace hugo {
 
   template <typename Graph, typename T, 
-	    typename CapMap=typename Graph::EdgeMap<T>, 
-            typename FlowMap=typename Graph::EdgeMap<T> >
+	    typename CapMap=typename Graph::template EdgeMap<T>, 
+            typename FlowMap=typename Graph::template EdgeMap<T> >
   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<int> level(G,n);      
-      typename Graph::NodeMap<T> excess(G); 
+      typename Graph::template NodeMap<int> level(G,n);      
+      typename Graph::template NodeMap<T> excess(G); 
 
       std::vector<Node> active(n-1,INVALID);
-      typename Graph::NodeMap<Node> next(G,INVALID);
+      typename Graph::template NodeMap<Node> next(G,INVALID);
       //Stack of the active nodes in level i < n.
       //We use it in both phases.
 
-      typename Graph::NodeMap<Node> left(G,INVALID);
-      typename Graph::NodeMap<Node> right(G,INVALID);
+      typename Graph::template NodeMap<Node> left(G,INVALID);
+      typename Graph::template NodeMap<Node> right(G,INVALID);
       std::vector<Node> level_list(n,INVALID);
       /*
 	List of the nodes in level i<n.

Modified: hugo/trunk/src/work/makefile
==============================================================================
--- hugo/trunk/src/work/makefile	(original)
+++ hugo/trunk/src/work/makefile	Sat Apr 24 16:25:03 2004
@@ -5,8 +5,8 @@
 
 # Hat, ez elismerem, hogy nagyon ronda, de mukodik minden altalam
 # ismert rendszeren :-)  (Misi)
-#CXX := $(shell type -p g++-3.4 || type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
-CXX := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
+CXX := $(shell type -p g++-3.4 || type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
+#CXX := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
 CC := $(CXX)