Changeset 392:b8d635e1672d in lemon-0.x for src/work

Timestamp:

04/24/04 16:25:03 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@523

Message:

g++-4.0

Location:

src/work

Files:

• jacint/preflow_res.h (modified) (2 diffs)
• makefile (modified) (1 diff)

src/work/jacint/preflow_res.h

@@ -16 +16 @@
 
   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 {
     
@@ -70 +70 @@
       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);
       /*

src/work/makefile

@@ -6 +6 @@
 # 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)