Changeset 1331 for branches/sandbox


Ignore:
Timestamp:
Dec 2, 2009 3:02:50 PM (10 years ago)
Author:
forrest
Message:

microsft compiler warnings

Location:
branches/sandbox/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/Cbc/src/CbcHeuristic.cpp

    r1315 r1331  
    13561356        for (int i = 1; i < cnt; ++i) {
    13571357            if (compare3BranchingObjects(brObj_[numObjects_], brObj_[i]) == 0) {
    1358                 int comp = brObj_[numObjects_]->compareBranchingObject(brObj_[i], br);
     1358                int comp = brObj_[numObjects_]->compareBranchingObject(brObj_[i], br!=0);
    13591359                switch (comp) {
    13601360                case CbcRangeSame: // the same range
  • branches/sandbox/Cbc/src/CbcMessage.cpp

    r1286 r1331  
    8888    // now override any language ones
    8989
    90     switch (language) {
     90    //switch (language) {
    9191
    92     default:
     92    //default:
    9393        message = NULL;
    94         break;
    95     }
     94        //  break;
     95        //}
    9696
    9797    // replace if any found
Note: See TracChangeset for help on using the changeset viewer.