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

    r1458 r1461  
    345345   inline int numberIterations() const  { return numberIterations_; }
    346346   inline int getIterationCount() const { return numberIterations_; }
    347   inline void setNumberIterations(int numberIterations)
    348   { numberIterations_ = numberIterations;}
     347  inline void setNumberIterations(int numberIterationsNew)
     348  { numberIterations_ = numberIterationsNew;}
    349349  /** Solve type - 1 simplex, 2 simplex interface, 3 Interior.*/
    350350  inline int solveType() const
     
    372372   inline int problemStatus() const            { return problemStatus_; }
    373373  /// Set problem status
    374   inline void setProblemStatus(int problemStatus)
    375   { problemStatus_ = problemStatus;}
     374  inline void setProblemStatus(int problemStatusNew)
     375  { problemStatus_ = problemStatusNew;}
    376376   /** Secondary status of problem - may get extended
    377377       0 - none
     
    389389   */
    390390   inline int secondaryStatus() const            { return secondaryStatus_; }
    391   inline void setSecondaryStatus(int status)
    392   { secondaryStatus_ = status;}
     391  inline void setSecondaryStatus(int newstatus)
     392  { secondaryStatus_ = newstatus;}
    393393   /// Are there a numerical difficulties?
    394394   inline bool isAbandoned() const             { return problemStatus_==4; }
     
    615615      to ClpPackedMatrix.  ClpModel takes ownership.
    616616  */
    617    inline void replaceMatrix(CoinPackedMatrix * matrix,
     617   inline void replaceMatrix(CoinPackedMatrix * newmatrix,
    618618                             bool deleteCurrent=false)
    619   { replaceMatrix(new ClpPackedMatrix(matrix),deleteCurrent);}
     619  { replaceMatrix(new ClpPackedMatrix(newmatrix),deleteCurrent);}
    620620   /// Objective value
    621621   inline double objectiveValue() const {
     
    744744  { return objective_;}
    745745  void setObjective(ClpObjective * objective);
    746   inline void setObjectivePointer(ClpObjective * objective)
    747   { objective_ = objective;}
     746  inline void setObjectivePointer(ClpObjective * newobjective)
     747  { objective_ = newobjective;}
    748748  /** Solve a problem with no elements - return status and
    749749      dual and primal infeasibilites */
Note: See TracChangeset for help on using the changeset viewer.