Index: branches/2018Q1/math/coinmp/files/patch-Cbc_src_CbcModel.cpp =================================================================== --- branches/2018Q1/math/coinmp/files/patch-Cbc_src_CbcModel.cpp (nonexistent) +++ branches/2018Q1/math/coinmp/files/patch-Cbc_src_CbcModel.cpp (revision 458137) @@ -0,0 +1,15 @@ +CbcModel.cpp:5322:41: error: reinterpret_cast from 'nullptr_t' to 'double *' is not allowed + clpSolver->setFakeObjective(reinterpret_cast (NULL)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- Cbc/src/CbcModel.cpp.orig 2015-06-04 17:10:17 UTC ++++ Cbc/src/CbcModel.cpp +@@ -5319,7 +5319,7 @@ void CbcModel::branchAndBound(int doStatistics) + OsiClpSolverInterface * clpSolver + = dynamic_cast (solver_); + if (clpSolver) +- clpSolver->setFakeObjective(reinterpret_cast (NULL)); ++ clpSolver->setFakeObjective(static_cast (NULL)); + } + #endif + moreSpecialOptions_ = saveMoreSpecialOptions; Property changes on: branches/2018Q1/math/coinmp/files/patch-Cbc_src_CbcModel.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/math/coinmp/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp =================================================================== --- branches/2018Q1/math/coinmp/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp (nonexistent) +++ branches/2018Q1/math/coinmp/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp (revision 458137) @@ -0,0 +1,17 @@ +In file included from CglLandPSimplex.cpp:11: +In file included from ./CglLandPSimplex.hpp:31: +./CglLandPUtils.hpp:88:25: error: reinterpret_cast from 'nullptr_t' to 'OsiRowCut *' is not allowed + cuts_.resize(i, reinterpret_cast (NULL)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- Cgl/src/CglLandP/CglLandPUtils.hpp.orig 2013-04-06 20:39:53 UTC ++++ Cgl/src/CglLandP/CglLandPUtils.hpp +@@ -85,7 +85,7 @@ struct Cuts + /** resize vector.*/ + void resize(unsigned int i) + { +- cuts_.resize(i, reinterpret_cast (NULL)); ++ cuts_.resize(i, static_cast (NULL)); + } + private: + /** Stores the number of cuts.*/ Property changes on: branches/2018Q1/math/coinmp/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/math/coinmp/files/patch-Clp_src_ClpModel.cpp =================================================================== --- branches/2018Q1/math/coinmp/files/patch-Clp_src_ClpModel.cpp (nonexistent) +++ branches/2018Q1/math/coinmp/files/patch-Clp_src_ClpModel.cpp (revision 458137) @@ -0,0 +1,15 @@ +ClpModel.cpp:3848:24: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed + reinterpret_cast (NULL) /*integrality*/, + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- Clp/src/ClpModel.cpp.orig 2015-03-19 08:09:18 UTC ++++ Clp/src/ClpModel.cpp +@@ -3845,7 +3845,7 @@ ClpModel::writeMps(const char *filename, + writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX, + getColLower(), getColUpper(), + objective, +- reinterpret_cast (NULL) /*integrality*/, ++ static_cast (NULL) /*integrality*/, + getRowLower(), getRowUpper(), + columnNames, rowNames); + // Pass in array saying if each variable integer Property changes on: branches/2018Q1/math/coinmp/files/patch-Clp_src_ClpModel.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1/math/coinmp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp =================================================================== --- branches/2018Q1/math/coinmp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp (nonexistent) +++ branches/2018Q1/math/coinmp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp (revision 458137) @@ -0,0 +1,15 @@ +OsiClpSolverInterface.cpp:1451:50: error: reinterpret_cast from 'nullptr_t' to 'int *' is not allowed + messagesPointer->setDetailMessages(100,10000,reinterpret_cast (NULL)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- Clp/src/OsiClp/OsiClpSolverInterface.cpp.orig 2015-07-14 13:16:13 UTC ++++ Clp/src/OsiClp/OsiClpSolverInterface.cpp +@@ -1448,7 +1448,7 @@ OsiClpSolverInterface::setupForRepeatedUse(int senseOf + if (stopPrinting) { + CoinMessages * messagesPointer = modelPtr_->messagesPointer(); + // won't even build messages +- messagesPointer->setDetailMessages(100,10000,reinterpret_cast (NULL)); ++ messagesPointer->setDetailMessages(100,10000,static_cast (NULL)); + } + #endif + } Property changes on: branches/2018Q1/math/coinmp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 458136) +++ branches/2018Q1 (revision 458137) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r458136