1.1 --- a/lemon/Makefile.am	Wed Nov 16 18:58:10 2005 +0000
     1.2 +++ b/lemon/Makefile.am	Thu Nov 17 10:14:55 2005 +0000
     1.3 @@ -69,7 +69,6 @@
     1.4  	graph_reader.h \
     1.5  	graph_writer.h \
     1.6  	bits/alteration_notifier.h \
     1.7 -	bits/map_iterator.h \
     1.8  	bits/array_map.h \
     1.9  	bits/default_map.h \
    1.10  	bits/extended_pair.h \

     2.1 --- a/lemon/graph_utils.h	Wed Nov 16 18:58:10 2005 +0000
     2.2 +++ b/lemon/graph_utils.h	Thu Nov 17 10:14:55 2005 +0000
     2.3 @@ -59,13 +59,13 @@
     2.4      typedef Graph::   Edge      Edge;			\
     2.5      typedef Graph::   EdgeIt    EdgeIt;			\
     2.6      typedef Graph:: InEdgeIt  InEdgeIt;			\
     2.7 -    typedef Graph::OutEdgeIt OutEdgeIt;			\
     2.8 -    typedef Graph::NodeMap<bool> BoolNodeMap;		\
     2.9 -    typedef Graph::NodeMap<int> IntNodeMap;		\
    2.10 -    typedef Graph::NodeMap<double> DoubleNodeMap;	\
    2.11 -    typedef Graph::EdgeMap<bool> BoolEdgeMap;		\
    2.12 -    typedef Graph::EdgeMap<int> IntEdgeMap;		\
    2.13 -    typedef Graph::EdgeMap<double> DoubleEdgeMap;
    2.14 +    typedef Graph::OutEdgeIt OutEdgeIt;			
    2.15 +//     typedef Graph::template NodeMap<bool> BoolNodeMap;	       
    2.16 +//     typedef Graph::template NodeMap<int> IntNodeMap;	       
    2.17 +//     typedef Graph::template NodeMap<double> DoubleNodeMap;  
    2.18 +//     typedef Graph::template EdgeMap<bool> BoolEdgeMap;	       
    2.19 +//     typedef Graph::template EdgeMap<int> IntEdgeMap;	       
    2.20 +//     typedef Graph::template EdgeMap<double> DoubleEdgeMap;
    2.21    
    2.22    ///Creates convenience typedefs for the undirected graph types and iterators
    2.23  
    2.24 @@ -85,10 +85,10 @@
    2.25    GRAPH_TYPEDEFS(Graph)						\
    2.26      typedef Graph:: UndirEdge   UndirEdge;			\
    2.27      typedef Graph:: UndirEdgeIt UndirEdgeIt;			\
    2.28 -    typedef Graph:: IncEdgeIt   IncEdgeIt;			\
    2.29 -    typedef Graph::UndirEdgeMap<bool> BoolUndirEdgeMap;		\
    2.30 -    typedef Graph::UndirEdgeMap<int> IntUndirEdgeMap;		\
    2.31 -    typedef Graph::UndirEdgeMap<double> DoubleUndirEdgeMap;
    2.32 +    typedef Graph:: IncEdgeIt   IncEdgeIt;		       
    2.33 +//     typedef Graph::template UndirEdgeMap<bool> BoolUndirEdgeMap;	 
    2.34 +//     typedef Graph::template UndirEdgeMap<int> IntUndirEdgeMap;
    2.35 +//     typedef Graph::template UndirEdgeMap<double> DoubleUndirEdgeMap;
    2.36    
    2.37  
    2.38  

     3.1 --- a/lemon/time_measure.h	Wed Nov 16 18:58:10 2005 +0000
     3.2 +++ b/lemon/time_measure.h	Thu Nov 17 10:14:55 2005 +0000
     3.3 @@ -378,7 +378,7 @@
     3.4      TimeStamp full;
     3.5      int total=0;
     3.6      for(int tn=1;tn < 1<<24; tn*=2) {
     3.7 -      for(;total<tn;total++) const_cast<F &>(f)();
     3.8 +      for(;total<tn;total++) f();
     3.9        full=t;
    3.10        if(full.realTime()>min_time) {
    3.11  	if(num) *num=total;