Ignore:
Timestamp:
Jul 24, 2007 3:52:28 PM (13 years ago)
Author:
forrest
Message:

changes to compile under gcc 4.3

File:
1 edited

Legend:

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

    r1034 r1054  
    10521052  memset(mark,0,numberColumns);
    10531053  for (int iColumn=0;iColumn<numberColumns;iColumn++)
    1054     next_[iColumn]=INT_MAX;
     1054    next_[iColumn]=COIN_INT_MAX;
    10551055  int i;
    10561056  int * keys = new int[numberSets_];
     
    10581058  CoinFillN(back,numberGubColumns_,-1);
    10591059  for (i=0;i<numberSets_;i++)
    1060     keys[i]=INT_MAX;
     1060    keys[i]=COIN_INT_MAX;
    10611061  delete [] dynamicStatus_;
    10621062  dynamicStatus_ = new unsigned char [numberGubColumns_];
     
    11021102    double value=0.0;
    11031103    j=keys[iSet];
    1104     while (j!=INT_MAX) {
     1104    while (j!=COIN_INT_MAX) {
    11051105      if (model->getStatus(j)== ClpSimplex::basic) {
    11061106        if (length[j]<smallest) {
     
    14371437  memset(mark,0,numberColumns);
    14381438  for (int iColumnX=0;iColumnX<firstAvailable_;iColumnX++)
    1439     next_[iColumnX]=INT_MAX;
     1439    next_[iColumnX]=COIN_INT_MAX;
    14401440  for (i=0;i<numberSets_;i++) {
    1441     keys[i]=INT_MAX;
     1441    keys[i]=COIN_INT_MAX;
    14421442    int iKey = keyVariable_[i];
    14431443    if (iKey<numberColumns)
     
    14561456  }
    14571457  for (i=0;i<numberSets_;i++) {
    1458     if (keys[i]!=INT_MAX) {
     1458    if (keys[i]!=COIN_INT_MAX) {
    14591459      // something in set
    14601460      int j;
     
    14721472            smallest=length[j];
    14731473          }
    1474           if (next_[j]!=INT_MAX) {
     1474          if (next_[j]!=COIN_INT_MAX) {
    14751475            j = next_[j];
    14761476          } else {
     
    14961496        while (1) {
    14971497          sol += columnSolution[j];
    1498           if (next_[j]!=INT_MAX) {
     1498          if (next_[j]!=COIN_INT_MAX) {
    14991499            j = next_[j];
    15001500          } else {
Note: See TracChangeset for help on using the changeset viewer.