1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

math/cbc: Update 2.9.9 -> 2.10.3

This commit is contained in:
Yuri Victorovich 2019-12-21 22:58:54 +00:00
parent dba00153f1
commit 88ae0a2723
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=520588
4 changed files with 17 additions and 17 deletions

View File

@ -2,9 +2,9 @@
PORTNAME= cbc
DISTVERSIONPREFIX= releases/
DISTVERSION= 2.9.9
PORTREVISION= 4
DISTVERSION= 2.10.3
CATEGORIES= math
PKGNAMEPREFIX= coin-or-
MAINTAINER= yuri@FreeBSD.org
COMMENT= Coin-or Branch and Cut: mixed integer programming solver

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1522614939
SHA256 (coin-or-Cbc-releases-2.9.9_GH0.tar.gz) = 3760fa9fe24fe3390c8b3d5f03583a62652d9b159aef9b0b609e4948ef1b8f29
SIZE (coin-or-Cbc-releases-2.9.9_GH0.tar.gz) = 1658623
TIMESTAMP = 1576962809
SHA256 (coin-or-Cbc-releases-2.10.3_GH0.tar.gz) = 944c1f717e653aa04f4d6c775aa91d749ab5990d6ee9c3e4f76b9df5bc6e2a8d
SIZE (coin-or-Cbc-releases-2.10.3_GH0.tar.gz) = 1637904

View File

@ -1,11 +1,11 @@
--- Cbc/src/CbcModel.cpp.orig 2018-04-16 07:45:54 UTC
--- Cbc/src/CbcModel.cpp.orig 2019-12-21 21:30:53 UTC
+++ Cbc/src/CbcModel.cpp
@@ -5338,7 +5338,7 @@ void CbcModel::branchAndBound(int doStat
OsiClpSolverInterface * clpSolver
= dynamic_cast<OsiClpSolverInterface *> (solver_);
if (clpSolver)
- clpSolver->setFakeObjective(reinterpret_cast<double *> (NULL));
+ clpSolver->setFakeObjective((double*)nullptr);
}
@@ -5417,7 +5417,7 @@ void CbcModel::branchAndBound(int doStatistics)
OsiClpSolverInterface *clpSolver
= dynamic_cast< OsiClpSolverInterface * >(solver_);
if (clpSolver)
- clpSolver->setFakeObjective(reinterpret_cast< double * >(NULL));
+ clpSolver->setFakeObjective((double*)nullptr);
}
#endif
moreSpecialOptions_ = saveMoreSpecialOptions;
moreSpecialOptions_ = saveMoreSpecialOptions;

View File

@ -77,13 +77,13 @@ include/coin/ClpConstraintAmpl.hpp
include/coin/OsiCbcSolverInterface.hpp
lib/libCbc.so
lib/libCbc.so.3
lib/libCbc.so.3.9.9
lib/libCbc.so.3.10.3
lib/libCbcSolver.so
lib/libCbcSolver.so.3
lib/libCbcSolver.so.3.9.9
lib/libCbcSolver.so.3.10.3
lib/libOsiCbc.so
lib/libOsiCbc.so.3
lib/libOsiCbc.so.3.9.9
lib/libOsiCbc.so.3.10.3
libdata/pkgconfig/cbc.pc
libdata/pkgconfig/osi-cbc.pc
share/coin/doc/Cbc/AUTHORS