[Lemon-commits] [lemon_svn] alpar: r3040 - hugo/trunk/lemon

[Lemon SVN]

Author: alpar
Date: Tue Oct 31 09:28:55 2006
New Revision: 3040

Modified:
   hugo/trunk/lemon/graph_adaptor.h

Log:
icpc-9.0 compilation bugfix

Modified: hugo/trunk/lemon/graph_adaptor.h
==============================================================================
--- hugo/trunk/lemon/graph_adaptor.h	(original)
+++ hugo/trunk/lemon/graph_adaptor.h	Tue Oct 31 09:28:55 2006
@@ -1430,20 +1430,20 @@
 
   template<typename Graph, typename Number,  
            typename CapacityMap, typename FlowMap, 
-           typename Tolerance = Tolerance<Number> >
+           typename Tol = Tolerance<Number> >
   class ResForwardFilter {
     const CapacityMap* capacity;
     const FlowMap* flow;
-    Tolerance tolerance;
+    Tol tolerance;
   public:
     typedef typename Graph::Edge Key;
     typedef bool Value;
 
     ResForwardFilter(const CapacityMap& _capacity, const FlowMap& _flow,
-                     const Tolerance& _tolerance = Tolerance()) 
+                     const Tol& _tolerance = Tol()) 
       : capacity(&_capacity), flow(&_flow), tolerance(_tolerance) { }
 
-    ResForwardFilter(const Tolerance& _tolerance) 
+    ResForwardFilter(const Tol& _tolerance) 
       : capacity(0), flow(0), tolerance(_tolerance)  { }
 
     void setCapacity(const CapacityMap& _capacity) { capacity = &_capacity; }
@@ -1456,19 +1456,19 @@
 
   template<typename Graph, typename Number,
 	   typename CapacityMap, typename FlowMap,
-           typename Tolerance = Tolerance<Number> >
+           typename Tol = Tolerance<Number> >
   class ResBackwardFilter {
     const CapacityMap* capacity;
     const FlowMap* flow;
-    Tolerance tolerance;
+    Tol tolerance;
   public:
     typedef typename Graph::Edge Key;
     typedef bool Value;
 
     ResBackwardFilter(const CapacityMap& _capacity, const FlowMap& _flow,
-                      const Tolerance& _tolerance = Tolerance())
+                      const Tol& _tolerance = Tol())
       : capacity(&_capacity), flow(&_flow), tolerance(_tolerance) { }
-    ResBackwardFilter(const Tolerance& _tolerance = Tolerance())
+    ResBackwardFilter(const Tol& _tolerance = Tol())
       : capacity(0), flow(0), tolerance(_tolerance) { }
     void setCapacity(const CapacityMap& _capacity) { capacity = &_capacity; }
     void setFlow(const FlowMap& _flow) { flow = &_flow; }
@@ -1516,7 +1516,7 @@
   ///
   template<typename Graph, typename Number, 
 	   typename CapacityMap, typename FlowMap,
-           typename Tolerance = Tolerance<Number> >
+           typename Tol = Tolerance<Number> >
   class ResGraphAdaptor : 
     public EdgeSubGraphAdaptor< 
     UndirGraphAdaptor<const Graph>, 
@@ -1568,7 +1568,7 @@
     /// Constructor of the residual graph. The parameters are the graph type,
     /// the flow map, the capacity map and a tolerance object.
     ResGraphAdaptor(const Graph& _graph, const CapacityMap& _capacity, 
-                    FlowMap& _flow, const Tolerance& _tolerance = Tolerance()) 
+                    FlowMap& _flow, const Tol& _tolerance = Tol()) 
       : Parent(), capacity(&_capacity), flow(&_flow), ugraph(_graph),
         forward_filter(_capacity, _flow, _tolerance), 
         backward_filter(_capacity, _flow, _tolerance),