Ignore:
Timestamp:
Aug 20, 2007 12:03:23 AM (12 years ago)
Author:
andreasw
Message:

merging changes from Bug Squashing Party Aug 2007 to regular trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CoinSolve.cpp

    r755 r765  
    190190//  End any fake main program
    191191//#############################################################################
    192 void CbcClpUnitTest (const CbcModel & saveModel);
     192// void CbcClpUnitTest (const CbcModel & saveModel);
    193193int main (int argc, const char *argv[])
    194194{
     
    215215  setCbcOrClpPrinting(false);
    216216#endif
    217   int returnCode = CbcMain1 (argc, argv,model);
     217  int returnCode = CbcMain1 (argc, argv,model, 777);
     218#if 0
     219  /* The call to CbcClpUnitTest was moved into CbcMain1. To make sure
     220     CbcMain1 behaves as it did before for any other call, I have added one more
     221     argument to indicate that it was called from here. */
    218222  if (returnCode!=777) {
    219223    //const CoinWarmStartBasis* debugws =
     
    227231    return 0;
    228232  }
    229 }
     233#else
     234  if (returnCode!=777) {
     235    return returnCode;
     236  } else {
     237    return 0;
     238  }
     239#endif
     240}
     241
    230242/*
    231243  Version 1.00.00 November 16 2005.
Note: See TracChangeset for help on using the changeset viewer.