Ignore:
Timestamp:
Aug 25, 2008 10:59:58 AM (11 years ago)
Author:
forrest
Message:

BSP changes from 1247 to 1259

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpDynamicMatrix.hpp

    r1088 r1264  
    156156  {
    157157    unsigned char & st_byte = status_[sequence];
    158     st_byte &= ~7;
    159     st_byte |= status;
     158    st_byte = static_cast<unsigned char>(st_byte & ~7);
     159    st_byte = static_cast<unsigned char>(st_byte | status);
    160160  }
    161161  /// Number of sets (dynamic rows)
     
    167167  }
    168168  inline void setFlagged(int i) {
    169     dynamicStatus_[i] |= 8;
     169    dynamicStatus_[i] = static_cast<unsigned char>(dynamicStatus_[i] | 8);
    170170  }
    171171  inline void unsetFlagged(int i) {
    172     dynamicStatus_[i]  &= ~8;;
     172    dynamicStatus_[i] = static_cast<unsigned char>(dynamicStatus_[i] & ~8);
    173173  }
    174174  inline void setDynamicStatus(int sequence, DynamicStatus status)
    175175  {
    176176    unsigned char & st_byte = dynamicStatus_[sequence];
    177     st_byte &= ~7;
    178     st_byte |= status;
     177    st_byte = static_cast<unsigned char>(st_byte & ~7);
     178    st_byte = static_cast<unsigned char>(st_byte | status);
    179179  }
    180180  inline DynamicStatus getDynamicStatus(int sequence) const
Note: See TracChangeset for help on using the changeset viewer.