Ignore:
Timestamp:
Nov 6, 2009 2:06:43 PM (11 years ago)
Author:
stefan
Message:

fix compiler warnings declaration of XXX shadows a member of YYY; remove unnecessary include to avoid warnings from CoinFactorization?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/1.11/Clp/src/ClpSolve.hpp

    r1458 r1461  
    122122  inline bool doDual() const
    123123  { return (independentOptions_[1]&1)==0;}
    124   inline void setDoDual(bool doDual)
    125   { if (doDual) independentOptions_[1]  &= ~1; else independentOptions_[1] |= 1;}
     124  inline void setDoDual(bool doDual_)
     125  { if (doDual_) independentOptions_[1]  &= ~1; else independentOptions_[1] |= 1;}
    126126  /// Whether we want to do singleton part of presolve
    127127  inline bool doSingleton() const
    128128  { return (independentOptions_[1]&2)==0;}
    129   inline void setDoSingleton(bool doSingleton)
    130   { if (doSingleton) independentOptions_[1]  &= ~2; else independentOptions_[1] |= 2;}
     129  inline void setDoSingleton(bool doSingleton_)
     130  { if (doSingleton_) independentOptions_[1]  &= ~2; else independentOptions_[1] |= 2;}
    131131  /// Whether we want to do doubleton part of presolve
    132132  inline bool doDoubleton() const
    133133  { return (independentOptions_[1]&4)==0;}
    134   inline void setDoDoubleton(bool doDoubleton)
    135   { if (doDoubleton) independentOptions_[1]  &= ~4; else independentOptions_[1] |= 4;}
     134  inline void setDoDoubleton(bool doDoubleton_)
     135  { if (doDoubleton_) independentOptions_[1]  &= ~4; else independentOptions_[1] |= 4;}
    136136  /// Whether we want to do tripleton part of presolve
    137137  inline bool doTripleton() const
    138138  { return (independentOptions_[1]&8)==0;}
    139   inline void setDoTripleton(bool doTripleton)
    140   { if (doTripleton) independentOptions_[1]  &= ~8; else independentOptions_[1] |= 8;}
     139  inline void setDoTripleton(bool doTripleton_)
     140  { if (doTripleton_) independentOptions_[1]  &= ~8; else independentOptions_[1] |= 8;}
    141141  /// Whether we want to do tighten part of presolve
    142142  inline bool doTighten() const
    143143  { return (independentOptions_[1]&16)==0;}
    144   inline void setDoTighten(bool doTighten)
    145   { if (doTighten) independentOptions_[1]  &= ~16; else independentOptions_[1] |= 16;}
     144  inline void setDoTighten(bool doTighten_)
     145  { if (doTighten_) independentOptions_[1]  &= ~16; else independentOptions_[1] |= 16;}
    146146  /// Whether we want to do forcing part of presolve
    147147  inline bool doForcing() const
    148148  { return (independentOptions_[1]&32)==0;}
    149   inline void setDoForcing(bool doForcing)
    150   { if (doForcing) independentOptions_[1]  &= ~32; else independentOptions_[1] |= 32;}
     149  inline void setDoForcing(bool doForcing_)
     150  { if (doForcing_) independentOptions_[1]  &= ~32; else independentOptions_[1] |= 32;}
    151151  /// Whether we want to do impliedfree part of presolve
    152152  inline bool doImpliedFree() const
     
    157157  inline bool doDupcol() const
    158158  { return (independentOptions_[1]&128)==0;}
    159   inline void setDoDupcol(bool doDupcol)
    160   { if (doDupcol) independentOptions_[1]  &= ~128; else independentOptions_[1] |= 128;}
     159  inline void setDoDupcol(bool doDupcol_)
     160  { if (doDupcol_) independentOptions_[1]  &= ~128; else independentOptions_[1] |= 128;}
    161161  /// Whether we want to do duprow part of presolve
    162162  inline bool doDuprow() const
    163163  { return (independentOptions_[1]&256)==0;}
    164   inline void setDoDuprow(bool doDuprow)
    165   { if (doDuprow) independentOptions_[1]  &= ~256; else independentOptions_[1] |= 256;}
     164  inline void setDoDuprow(bool doDuprow_)
     165  { if (doDuprow_) independentOptions_[1]  &= ~256; else independentOptions_[1] |= 256;}
    166166  /// Whether we want to do singleton column part of presolve
    167167  inline bool doSingletonColumn() const
    168168  { return (independentOptions_[1]&512)==0;}
    169   inline void setDoSingletonColumn(bool doSingleton)
    170   { if (doSingleton) independentOptions_[1]  &= ~512; else independentOptions_[1] |= 512;}
     169  inline void setDoSingletonColumn(bool doSingleton_)
     170  { if (doSingleton_) independentOptions_[1]  &= ~512; else independentOptions_[1] |= 512;}
    171171  /// Set whole group
    172172  inline int presolveActions() const
Note: See TracChangeset for help on using the changeset viewer.