Changeset 1875

Timestamp:

Mar 10, 2013 1:20:11 PM (9 years ago)

Author:

forrest

Message:

fix cbcmain0 bug

Location:

stable/2.8/Cbc/src

Files:

• CbcModel.cpp (modified) (1 diff)
• CbcSolver.cpp (modified) (1 diff)

stable/2.8/Cbc/src/CbcModel.cpp

@@ -14194 +14194 @@
             CbcBranchingObject * branch = static_cast <CbcBranchingObject *>(branch2) ;
 #endif
-            branch->setModel(this);
-            branchesLeft = node->branch(NULL); // old way
+            //branch->setModel(this);
+            branchesLeft = node->branch(solver_); // old way
             if (parallelMode() >= 0)
                 branch->setModel(baseModel);

stable/2.8/Cbc/src/CbcSolver.cpp

@@ -1106 +1106 @@
             }
         }
-        input[i] = '\0';
+        input[i++] = '\0';
         argv[j+1] = CoinStrdup(input + saveI);
         while (input[i] == ' ')