Ignore:
Timestamp:
May 2, 2011 4:58:39 AM (9 years ago)
Author:
stefan
Message:

fix compiler warnings, including one that pointed to a bug

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpModel.cpp

    r1723 r1726  
    32903290     }
    32913291#endif
    3292      int size = rowNames_.size();
     3292     int size = static_cast<int>(rowNames_.size());
    32933293     if (size > iRow) {
    32943294          return rowNames_[iRow];
     
    33103310#endif
    33113311     unsigned int maxLength = lengthNames_;
    3312      int size = rowNames_.size();
     3312     size_t size = static_cast<int>(rowNames_.size());
    33133313     if (size <= iRow)
    33143314          rowNames_.resize(iRow + 1);
     
    33273327     }
    33283328#endif
    3329      int size = columnNames_.size();
     3329     int size = static_cast<int>(columnNames_.size());
    33303330     if (size > iColumn) {
    33313331          return columnNames_[iColumn];
     
    33473347#endif
    33483348     unsigned int maxLength = lengthNames_;
    3349      int size = columnNames_.size();
     3349     int size = static_cast<int>(columnNames_.size());
    33503350     if (size <= iColumn)
    33513351          columnNames_.resize(iColumn + 1);
     
    33603360{
    33613361     unsigned int maxLength = lengthNames_;
    3362      int size = rowNames_.size();
     3362     int size = static_cast<int>(rowNames_.size());
    33633363     if (size != numberRows_)
    33643364          rowNames_.resize(numberRows_);
     
    33763376{
    33773377     unsigned int maxLength = lengthNames_;
    3378      int size = columnNames_.size();
     3378     int size = static_cast<int>(columnNames_.size());
    33793379     if (size != numberColumns_)
    33803380          columnNames_.resize(numberColumns_);
     
    33923392{
    33933393     unsigned int maxLength = lengthNames_;
    3394      int size = rowNames_.size();
     3394     int size = static_cast<int>(rowNames_.size());
    33953395     if (size != numberRows_)
    33963396          rowNames_.resize(numberRows_);
     
    34153415{
    34163416     unsigned int maxLength = lengthNames_;
    3417      int size = columnNames_.size();
     3417     int size = static_cast<int>(columnNames_.size());
    34183418     if (size != numberColumns_)
    34193419          columnNames_.resize(numberColumns_);
     
    36503650     if (lengthNames()) {
    36513651          rowNames = new char * [numberRows_+1];
    3652           int numberNames = rowNames_.size();
     3652          int numberNames = static_cast<int>(rowNames_.size());
    36533653          numberNames = CoinMin(numberRows_, numberNames);
    36543654          int iRow;
     
    36903690     if (lengthNames()) {
    36913691          columnNames = new char * [numberColumns_];
    3692           int numberNames = columnNames_.size();
     3692          int numberNames = static_cast<int>(columnNames_.size());
    36933693          numberNames = CoinMin(numberColumns_, numberNames);
    36943694          int iColumn;
     
    38873887          char temp[30];
    38883888          strcpy(temp, rowName(i).c_str());
    3889           int length = strlen(temp);
    3890           for (int j = 0; j < length; j++) {
     3889          size_t length = strlen(temp);
     3890          for (size_t j = 0; j < length; j++) {
    38913891               if (temp[j] == '-')
    38923892                    temp[j] = '_';
     
    38973897          char temp[30];
    38983898          strcpy(temp, columnName(i).c_str());
    3899           int length = strlen(temp);
    3900           for (int j = 0; j < length; j++) {
     3899          size_t length = strlen(temp);
     3900          for (size_t j = 0; j < length; j++) {
    39013901               if (temp[j] == '-')
    39023902                    temp[j] = '_';
Note: See TracChangeset for help on using the changeset viewer.