1.1 --- a/src/work/jacint/preflow_res.h	Sat Apr 24 13:24:42 2004 +0000
     1.2 +++ b/src/work/jacint/preflow_res.h	Sat Apr 24 14:25:03 2004 +0000
     1.3 @@ -15,8 +15,8 @@
     1.4  namespace hugo {
     1.5  
     1.6    template <typename Graph, typename T, 
     1.7 -	    typename CapMap=typename Graph::EdgeMap<T>, 
     1.8 -            typename FlowMap=typename Graph::EdgeMap<T> >
     1.9 +	    typename CapMap=typename Graph::template EdgeMap<T>, 
    1.10 +            typename FlowMap=typename Graph::template EdgeMap<T> >
    1.11    class PreflowRes {
    1.12      
    1.13      typedef typename Graph::Node Node;
    1.14 @@ -69,16 +69,16 @@
    1.15        int k=n-2;  //bound on the highest level under n containing a node
    1.16        int b=k;    //bound on the highest level under n of an active node
    1.17        
    1.18 -      typename Graph::NodeMap<int> level(G,n);      
    1.19 -      typename Graph::NodeMap<T> excess(G); 
    1.20 +      typename Graph::template NodeMap<int> level(G,n);      
    1.21 +      typename Graph::template NodeMap<T> excess(G); 
    1.22  
    1.23        std::vector<Node> active(n-1,INVALID);
    1.24 -      typename Graph::NodeMap<Node> next(G,INVALID);
    1.25 +      typename Graph::template NodeMap<Node> next(G,INVALID);
    1.26        //Stack of the active nodes in level i < n.
    1.27        //We use it in both phases.
    1.28  
    1.29 -      typename Graph::NodeMap<Node> left(G,INVALID);
    1.30 -      typename Graph::NodeMap<Node> right(G,INVALID);
    1.31 +      typename Graph::template NodeMap<Node> left(G,INVALID);
    1.32 +      typename Graph::template NodeMap<Node> right(G,INVALID);
    1.33        std::vector<Node> level_list(n,INVALID);
    1.34        /*
    1.35  	List of the nodes in level i<n.

     2.1 --- a/src/work/makefile	Sat Apr 24 13:24:42 2004 +0000
     2.2 +++ b/src/work/makefile	Sat Apr 24 14:25:03 2004 +0000
     2.3 @@ -5,8 +5,8 @@
     2.4  
     2.5  # Hat, ez elismerem, hogy nagyon ronda, de mukodik minden altalam
     2.6  # ismert rendszeren :-)  (Misi)
     2.7 -#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++)
     2.8 -CXX := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
     2.9 +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++)
    2.10 +#CXX := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
    2.11  CC := $(CXX)
    2.12  
    2.13