Changeset 2277:a7896017fc7d in lemon-0.x for lemon/graph_adaptor.h

Timestamp:

10/31/06 09:28:55 (17 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

icpc-9.0 compilation bugfix

File:

• lemon/graph_adaptor.h (modified) (6 diffs)

lemon/graph_adaptor.h

@@ -1431 +1431 @@
   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;
@@ -1441 +1441 @@
 
     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)  { }
 
@@ -1457 +1457 @@
   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;
@@ -1467 +1467 @@
 
     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; }
@@ -1517 +1517 @@
   template<typename Graph, typename Number, 
            typename CapacityMap, typename FlowMap,
-           typename Tolerance = Tolerance<Number> >
+           typename Tol = Tolerance<Number> >
   class ResGraphAdaptor : 
     public EdgeSubGraphAdaptor< 
@@ -1569 +1569 @@
     /// 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),