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/ClpSimplex.hpp

    r1458 r1461  
    2020class ClpPrimalColumnPivot;
    2121class ClpFactorization;
    22 #include "ClpFactorization.hpp"
    2322class CoinIndexedVector;
    2423class ClpNonLinearCost;
     
    857856  inline Status getStatus(int sequence) const
    858857  {return static_cast<Status> (status_[sequence]&7);}
    859   inline void setStatus(int sequence, Status status)
     858  inline void setStatus(int sequence, Status newstatus)
    860859  {
    861860    unsigned char & st_byte = status_[sequence];
    862861    st_byte = static_cast<unsigned char>(st_byte & ~7);
    863     st_byte = static_cast<unsigned char>(st_byte | status);
     862    st_byte = static_cast<unsigned char>(st_byte | newstatus);
    864863  }
    865864  /// Start or reset using maximumRows_ and Columns_ - true if change
     
    980979  inline FakeBound getFakeBound(int sequence) const
    981980  {return static_cast<FakeBound> ((status_[sequence]>>3)&3);}
    982   inline void setRowStatus(int sequence, Status status)
     981  inline void setRowStatus(int sequence, Status newstatus)
    983982  {
    984983    unsigned char & st_byte = status_[sequence+numberColumns_];
    985984    st_byte = static_cast<unsigned char>(st_byte & ~7);
    986     st_byte = static_cast<unsigned char>(st_byte | status);
     985    st_byte = static_cast<unsigned char>(st_byte | newstatus);
    987986  }
    988987  inline Status getRowStatus(int sequence) const
    989988  {return static_cast<Status> (status_[sequence+numberColumns_]&7);}
    990   inline void setColumnStatus(int sequence, Status status)
     989  inline void setColumnStatus(int sequence, Status newstatus)
    991990  {
    992991    unsigned char & st_byte = status_[sequence];
    993992    st_byte = static_cast<unsigned char>(st_byte & ~7);
    994     st_byte = static_cast<unsigned char>(st_byte | status);
     993    st_byte = static_cast<unsigned char>(st_byte | newstatus);
    995994  }
    996995  inline Status getColumnStatus(int sequence) const
     
    11331132      /** Set a single column lower and upper bound */
    11341133      inline void setColBounds( int elementIndex,
    1135         double lower, double upper )
    1136        { setColumnBounds(elementIndex, lower, upper);}
     1134        double newlower, double newupper )
     1135       { setColumnBounds(elementIndex, newlower, newupper);}
    11371136
    11381137      /** Set the bounds on a number of columns simultaneously<br>
Note: See TracChangeset for help on using the changeset viewer.