[Lemon-commits] alpar: r3219 - lemon/trunk/lemon

[Lemon SVN]

Author: alpar
Date: Sat Mar  3 12:57:07 2007
New Revision: 3219

Modified:
   lemon/trunk/lemon/preflow.h
   lemon/trunk/lemon/random.h

Log:
Fix icc compilation failures


Modified: lemon/trunk/lemon/preflow.h
==============================================================================
--- lemon/trunk/lemon/preflow.h	(original)
+++ lemon/trunk/lemon/preflow.h	Sat Mar  3 12:57:07 2007
@@ -59,14 +59,14 @@
   ///\param Num The number type of the capacities and the flow values.
   ///\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 
   ///\todo Second template parameter is superfluous
   template <typename Graph, typename Num,
 	    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:
     typedef typename Graph::Node Node;
@@ -84,7 +84,7 @@
     const CapacityMap* _capacity;
     FlowMap* _flow;
 
-    Tolerance _surely;
+    Tol _surely;
     
     int _node_num;      //the number of nodes of G
     
@@ -155,13 +155,13 @@
     ///\param _t The target node.
     ///\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
     ///flowMap, resp.
     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),
 	_node_num(countNodes(_gr)), level(_gr), excess(_gr,0), 
@@ -174,7 +174,7 @@
 
     ///Give a reference to the tolerance handler class
     ///\sa Tolerance
-    Tolerance &tolerance() { return _surely; }
+    Tol &tolerance() { return _surely; }
 
     ///Runs the preflow algorithm.  
 

Modified: lemon/trunk/lemon/random.h
==============================================================================
--- lemon/trunk/lemon/random.h	(original)
+++ lemon/trunk/lemon/random.h	Sat Mar  3 12:57:07 2007
@@ -308,8 +308,8 @@
 
 
     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) {
         Word max = Word(bound - 1);