1.1 --- a/lemon/graph_adaptor.h	Mon Oct 30 17:22:14 2006 +0000
     1.2 +++ b/lemon/graph_adaptor.h	Tue Oct 31 08:28:55 2006 +0000
     1.3 @@ -1430,20 +1430,20 @@
     1.4  
     1.5    template<typename Graph, typename Number,  
     1.6             typename CapacityMap, typename FlowMap, 
     1.7 -           typename Tolerance = Tolerance<Number> >
     1.8 +           typename Tol = Tolerance<Number> >
     1.9    class ResForwardFilter {
    1.10      const CapacityMap* capacity;
    1.11      const FlowMap* flow;
    1.12 -    Tolerance tolerance;
    1.13 +    Tol tolerance;
    1.14    public:
    1.15      typedef typename Graph::Edge Key;
    1.16      typedef bool Value;
    1.17  
    1.18      ResForwardFilter(const CapacityMap& _capacity, const FlowMap& _flow,
    1.19 -                     const Tolerance& _tolerance = Tolerance()) 
    1.20 +                     const Tol& _tolerance = Tol()) 
    1.21        : capacity(&_capacity), flow(&_flow), tolerance(_tolerance) { }
    1.22  
    1.23 -    ResForwardFilter(const Tolerance& _tolerance) 
    1.24 +    ResForwardFilter(const Tol& _tolerance) 
    1.25        : capacity(0), flow(0), tolerance(_tolerance)  { }
    1.26  
    1.27      void setCapacity(const CapacityMap& _capacity) { capacity = &_capacity; }
    1.28 @@ -1456,19 +1456,19 @@
    1.29  
    1.30    template<typename Graph, typename Number,
    1.31  	   typename CapacityMap, typename FlowMap,
    1.32 -           typename Tolerance = Tolerance<Number> >
    1.33 +           typename Tol = Tolerance<Number> >
    1.34    class ResBackwardFilter {
    1.35      const CapacityMap* capacity;
    1.36      const FlowMap* flow;
    1.37 -    Tolerance tolerance;
    1.38 +    Tol tolerance;
    1.39    public:
    1.40      typedef typename Graph::Edge Key;
    1.41      typedef bool Value;
    1.42  
    1.43      ResBackwardFilter(const CapacityMap& _capacity, const FlowMap& _flow,
    1.44 -                      const Tolerance& _tolerance = Tolerance())
    1.45 +                      const Tol& _tolerance = Tol())
    1.46        : capacity(&_capacity), flow(&_flow), tolerance(_tolerance) { }
    1.47 -    ResBackwardFilter(const Tolerance& _tolerance = Tolerance())
    1.48 +    ResBackwardFilter(const Tol& _tolerance = Tol())
    1.49        : capacity(0), flow(0), tolerance(_tolerance) { }
    1.50      void setCapacity(const CapacityMap& _capacity) { capacity = &_capacity; }
    1.51      void setFlow(const FlowMap& _flow) { flow = &_flow; }
    1.52 @@ -1516,7 +1516,7 @@
    1.53    ///
    1.54    template<typename Graph, typename Number, 
    1.55  	   typename CapacityMap, typename FlowMap,
    1.56 -           typename Tolerance = Tolerance<Number> >
    1.57 +           typename Tol = Tolerance<Number> >
    1.58    class ResGraphAdaptor : 
    1.59      public EdgeSubGraphAdaptor< 
    1.60      UndirGraphAdaptor<const Graph>, 
    1.61 @@ -1568,7 +1568,7 @@
    1.62      /// Constructor of the residual graph. The parameters are the graph type,
    1.63      /// the flow map, the capacity map and a tolerance object.
    1.64      ResGraphAdaptor(const Graph& _graph, const CapacityMap& _capacity, 
    1.65 -                    FlowMap& _flow, const Tolerance& _tolerance = Tolerance()) 
    1.66 +                    FlowMap& _flow, const Tol& _tolerance = Tol()) 
    1.67        : Parent(), capacity(&_capacity), flow(&_flow), ugraph(_graph),
    1.68          forward_filter(_capacity, _flow, _tolerance), 
    1.69          backward_filter(_capacity, _flow, _tolerance),