From owner-svn-ports-all@freebsd.org Fri Jan 5 12:37:47 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7769FEA663E; Fri, 5 Jan 2018 12:37:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ECB666B23; Fri, 5 Jan 2018 12:37:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w05Cbkpf069601; Fri, 5 Jan 2018 12:37:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w05Cbkpi069597; Fri, 5 Jan 2018 12:37:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801051237.w05Cbkpi069597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 5 Jan 2018 12:37:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458136 - head/math/coinmp/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/math/coinmp/files X-SVN-Commit-Revision: 458136 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jan 2018 12:37:47 -0000 Author: jbeich Date: Fri Jan 5 12:37:45 2018 New Revision: 458136 URL: https://svnweb.freebsd.org/changeset/ports/458136 Log: math/coinmp: unbreak build with Clang 6 (C++14 by default) ClpModel.cpp:3848:24: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed reinterpret_cast (NULL) /*integrality*/, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ OsiClpSolverInterface.cpp:1451:50: error: reinterpret_cast from 'nullptr_t' to 'int *' is not allowed messagesPointer->setDetailMessages(100,10000,reinterpret_cast (NULL)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 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)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CbcModel.cpp:5322:41: error: reinterpret_cast from 'nullptr_t' to 'double *' is not allowed clpSolver->setFakeObjective(reinterpret_cast (NULL)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reported by: antoine (via bug 224669) Added: head/math/coinmp/files/patch-Cbc_src_CbcModel.cpp (contents, props changed) head/math/coinmp/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp (contents, props changed) head/math/coinmp/files/patch-Clp_src_ClpModel.cpp (contents, props changed) head/math/coinmp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp (contents, props changed) Added: head/math/coinmp/files/patch-Cbc_src_CbcModel.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/coinmp/files/patch-Cbc_src_CbcModel.cpp Fri Jan 5 12:37:45 2018 (r458136) @@ -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; Added: head/math/coinmp/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/coinmp/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp Fri Jan 5 12:37:45 2018 (r458136) @@ -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.*/ Added: head/math/coinmp/files/patch-Clp_src_ClpModel.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/coinmp/files/patch-Clp_src_ClpModel.cpp Fri Jan 5 12:37:45 2018 (r458136) @@ -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 Added: head/math/coinmp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/coinmp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp Fri Jan 5 12:37:45 2018 (r458136) @@ -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 + }