mirror of
https://git.freebsd.org/ports.git
synced 2025-05-21 03:23:10 -04:00
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)
This commit is contained in:
parent
f25ce0e84b
commit
c59700567b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=463298
4 changed files with 48 additions and 0 deletions
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
PORTNAME= ogdf
|
PORTNAME= ogdf
|
||||||
PORTVERSION= 2015.05
|
PORTVERSION= 2015.05
|
||||||
|
PORTREVISION= 1
|
||||||
CATEGORIES= math
|
CATEGORIES= math
|
||||||
MASTER_SITES= http://www.ogdf.net/lib/exe/fetch.php/tech:
|
MASTER_SITES= http://www.ogdf.net/lib/exe/fetch.php/tech:
|
||||||
DISTNAME= ${PORTNAME}.v${PORTVERSION}
|
DISTNAME= ${PORTNAME}.v${PORTVERSION}
|
||||||
|
|
17
math/ogdf/files/patch-include_coin_CglLandPUtils.hpp
Normal file
17
math/ogdf/files/patch-include_coin_CglLandPUtils.hpp
Normal file
|
@ -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<OsiRowCut *> (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<OsiRowCut *> (NULL));
|
||||||
|
+ cuts_.resize(i, static_cast<OsiRowCut *> (NULL));
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
/** Stores the number of cuts.*/
|
15
math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp
Normal file
15
math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
ClpModel.cpp:3848:24: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed
|
||||||
|
reinterpret_cast<const char*> (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<const char*> (NULL) /*integrality*/,
|
||||||
|
+ static_cast<const char*> (NULL) /*integrality*/,
|
||||||
|
getRowLower(), getRowUpper(),
|
||||||
|
columnNames, rowNames);
|
||||||
|
// Pass in array saying if each variable integer
|
|
@ -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<int *> (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<int *> (NULL));
|
||||||
|
+ messagesPointer->setDetailMessages(100,10000,static_cast<int *> (NULL));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue