From owner-svn-ports-all@freebsd.org Thu Mar 1 12:13:06 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 924E1F4352A; Thu, 1 Mar 2018 12:13:06 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4683E805B0; Thu, 1 Mar 2018 12:13:06 +0000 (UTC) (envelope-from woodsb02@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FE18755; Thu, 1 Mar 2018 12:13:06 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w21CD6sV030063; Thu, 1 Mar 2018 12:13:06 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w21CD5PI030059; Thu, 1 Mar 2018 12:13:05 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201803011213.w21CD5PI030059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Thu, 1 Mar 2018 12:13:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463299 - in branches/2018Q1/math/ogdf: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in branches/2018Q1/math/ogdf: . files X-SVN-Commit-Revision: 463299 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: Thu, 01 Mar 2018 12:13:06 -0000 Author: woodsb02 Date: Thu Mar 1 12:13:05 2018 New Revision: 463299 URL: https://svnweb.freebsd.org/changeset/ports/463299 Log: MFH: r463298 math/ogdf: unbreak build with Clang 6 (C++14 by default) The bundled version of CoinMP required the same patches as those applied to the port math/coinmp, so the patches were copied from there. Submitted by: jbeich (via commit r458136) Reported by: antoine (via bug 224669) Approved by: ports-secteam blanket Added: branches/2018Q1/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp - copied unchanged from r463298, head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp branches/2018Q1/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp - copied unchanged from r463298, head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp branches/2018Q1/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp - copied unchanged from r463298, head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp Modified: branches/2018Q1/math/ogdf/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/math/ogdf/Makefile ============================================================================== --- branches/2018Q1/math/ogdf/Makefile Thu Mar 1 12:09:48 2018 (r463298) +++ branches/2018Q1/math/ogdf/Makefile Thu Mar 1 12:13:05 2018 (r463299) @@ -3,6 +3,7 @@ PORTNAME= ogdf PORTVERSION= 2015.05 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.ogdf.net/lib/exe/fetch.php/tech: DISTNAME= ${PORTNAME}.v${PORTVERSION} Copied: branches/2018Q1/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp (from r463298, head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp Thu Mar 1 12:13:05 2018 (r463299, copy of r463298, head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp) @@ -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)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- include/coin/CglLandPUtils.hpp.orig 2015-05-29 15:36:11 UTC ++++ include/coin/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.*/ Copied: branches/2018Q1/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp (from r463298, head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp Thu Mar 1 12:13:05 2018 (r463299, copy of r463298, head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp) @@ -0,0 +1,15 @@ +ClpModel.cpp:3848:24: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed + reinterpret_cast (NULL) /*integrality*/, + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- src/coin/Clp/ClpModel.cpp.orig 2015-05-29 15:36:41 UTC ++++ src/coin/Clp/ClpModel.cpp +@@ -3619,7 +3619,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 Copied: branches/2018Q1/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp (from r463298, head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp Thu Mar 1 12:13:05 2018 (r463299, copy of r463298, head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp) @@ -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)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- src/coin/OsiClp/OsiClpSolverInterface.cpp.orig 2015-05-29 15:36:45 UTC ++++ src/coin/OsiClp/OsiClpSolverInterface.cpp +@@ -1422,7 +1422,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 + }