COIN-OR::LEMON - Graph Library

Changeset 2387:317b9a88c350 in lemon-0.x


Ignore:
Timestamp:
03/03/07 12:57:07 (13 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:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/preflow.h

    r2386 r2387  
    6060  ///\param CapacityMap The capacity map type.
    6161  ///\param FlowMap The flow map type.
    62   ///\param Tolerance The tolerance type.
     62  ///\param Tol The tolerance type.
    6363  ///
    6464  ///\author Jacint Szabo
     
    6767            typename CapacityMap=typename Graph::template EdgeMap<Num>,
    6868            typename FlowMap=typename Graph::template EdgeMap<Num>,
    69             typename Tolerance=Tolerance<Num> >
     69            typename Tol=Tolerance<Num> >
    7070  class Preflow {
    7171  protected:
     
    8585    FlowMap* _flow;
    8686
    87     Tolerance _surely;
     87    Tol _surely;
    8888   
    8989    int _node_num;      //the number of nodes of G
     
    156156    ///\param _cap The capacity of the edges.
    157157    ///\param _f The flow of the edges.
    158     ///\param _sr Tolerance class.
     158    ///\param _sr Tol class.
    159159    ///Except the graph, all of these parameters can be reset by
    160160    ///calling \ref source, \ref target, \ref capacityMap and \ref
     
    162162    Preflow(const Graph& _gr, Node _s, Node _t,
    163163            const CapacityMap& _cap, FlowMap& _f,
    164             const Tolerance &_sr=Tolerance()) :
     164            const Tol &_sr=Tol()) :
    165165        _g(&_gr), _source(_s), _target(_t), _capacity(&_cap),
    166166        _flow(&_f), _surely(_sr),
     
    175175    ///Give a reference to the tolerance handler class
    176176    ///\sa Tolerance
    177     Tolerance &tolerance() { return _surely; }
     177    Tol &tolerance() { return _surely; }
    178178
    179179    ///Runs the preflow algorithm. 
  • lemon/random.h

    r2386 r2387  
    309309
    310310    template <typename Result, typename Word,
    311               bool one_word = std::numeric_limits<Word>::digits <
    312                               std::numeric_limits<Result>::digits>
     311              bool one_word = (std::numeric_limits<Word>::digits <
     312                               std::numeric_limits<Result>::digits) >
    313313    struct Mapping {
    314314      static Result map(RandomCore<Word>& rnd, const Result& bound) {
Note: See TracChangeset for help on using the changeset viewer.