Changeset 1875


Ignore:
Timestamp:
Mar 10, 2013 1:20:11 PM (6 years ago)
Author:
forrest
Message:

fix cbcmain0 bug

Location:
stable/2.8/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc/src/CbcModel.cpp

    r1874 r1875  
    1419414194            CbcBranchingObject * branch = static_cast <CbcBranchingObject *>(branch2) ;
    1419514195#endif
    14196             branch->setModel(this);
    14197             branchesLeft = node->branch(NULL); // old way
     14196            //branch->setModel(this);
     14197            branchesLeft = node->branch(solver_); // old way
    1419814198            if (parallelMode() >= 0)
    1419914199                branch->setModel(baseModel);
  • stable/2.8/Cbc/src/CbcSolver.cpp

    r1865 r1875  
    11061106            }
    11071107        }
    1108         input[i] = '\0';
     1108        input[i++] = '\0';
    11091109        argv[j+1] = CoinStrdup(input + saveI);
    11101110        while (input[i] == ' ')
Note: See TracChangeset for help on using the changeset viewer.