Ignore:
Timestamp:
Apr 10, 2013 12:52:27 PM (7 years ago)
Author:
stefan
Message:

sync with trunk rev 1940

Location:
stable/1.15/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/src

  • stable/1.15/Clp/src/ClpModel.cpp

    r1928 r1941  
    22862286          }
    22872287#endif
    2288           //if (elements)
    2289           matrix_->appendMatrix(number, 1, columnStarts, rows, elements);
     2288          if (elements)
     2289            matrix_->appendMatrix(number, 1, columnStarts, rows, elements);
    22902290     }
    22912291}
     
    34243424// Copies in names
    34253425void
    3426 ClpModel::copyNames(std::vector<std::string> & rowNames,
    3427                     std::vector<std::string> & columnNames)
     3426ClpModel::copyNames(const std::vector<std::string> & rowNames,
     3427                    const std::vector<std::string> & columnNames)
    34283428{
    34293429     unsigned int maxLength = 0;
Note: See TracChangeset for help on using the changeset viewer.