Changeset 2387:317b9a88c350 in lemon-0.x

Timestamp:

03/03/07 12:57:07 (17 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Fix icc compilation failures

Location:

lemon

Files:

• preflow.h (modified) (6 diffs)
• random.h (modified) (1 diff)

lemon/preflow.h

@@ -60 +60 @@
   ///\param CapacityMap The capacity map type.
   ///\param FlowMap The flow map type.
-  ///\param Tolerance The tolerance type. 
+  ///\param Tol The tolerance type. 
   ///
   ///\author Jacint Szabo 
@@ -67 +67 @@
             typename CapacityMap=typename Graph::template EdgeMap<Num>,
             typename FlowMap=typename Graph::template EdgeMap<Num>,
-            typename Tolerance=Tolerance<Num> >
+            typename Tol=Tolerance<Num> >
   class Preflow {
   protected:
@@ -85 +85 @@
     FlowMap* _flow;
 
-    Tolerance _surely;
+    Tol _surely;
     
     int _node_num;      //the number of nodes of G
@@ -156 +156 @@
     ///\param _cap The capacity of the edges. 
     ///\param _f The flow of the edges. 
-    ///\param _sr Tolerance class.
+    ///\param _sr Tol class.
     ///Except the graph, all of these parameters can be reset by
     ///calling \ref source, \ref target, \ref capacityMap and \ref
@@ -162 +162 @@
     Preflow(const Graph& _gr, Node _s, Node _t, 
             const CapacityMap& _cap, FlowMap& _f,
-            const Tolerance &_sr=Tolerance()) :
+            const Tol &_sr=Tol()) :
         _g(&_gr), _source(_s), _target(_t), _capacity(&_cap),
         _flow(&_f), _surely(_sr),
@@ -175 +175 @@
     ///Give a reference to the tolerance handler class
     ///\sa Tolerance
-    Tolerance &tolerance() { return _surely; }
+    Tol &tolerance() { return _surely; }
 
     ///Runs the preflow algorithm.  

lemon/random.h

@@ -309 +309 @@
 
     template <typename Result, typename Word,
-              bool one_word = std::numeric_limits<Word>::digits < 
-                              std::numeric_limits<Result>::digits>
+              bool one_word = (std::numeric_limits<Word>::digits < 
+                               std::numeric_limits<Result>::digits) >
     struct Mapping {
       static Result map(RandomCore<Word>& rnd, const Result& bound) {