Skip to content

Commit 0cc3ead

Browse files
MizuxMizux
committed
scip: Fix 10.0.0 support
1 parent f2eef50 commit 0cc3ead

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

‎ortools/linear_solver/proto_solver/scip_proto_solver.cc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,13 @@
5050
#include "scip/cons_indicator.h"
5151
#include "scip/cons_linear.h"
5252
#include "scip/cons_or.h"
53+
#if SCIP_VERSION_MAJOR >= 10
54+
#include "scip/cons_nonlinear.h"
55+
#define SCIPcreateConsBasicQuadratic SCIPcreateConsBasicQuadraticNonlinear
56+
#define SCIPcreateConsQuadratic SCIPcreateConsQuadraticNonlinear
57+
#else
5358
#include "scip/cons_quadratic.h"
59+
#endif // SCIP_VERSION_MAJOR >= 10
5460
#include "scip/cons_sos1.h"
5561
#include "scip/cons_sos2.h"
5662
#include "scip/def.h"

‎ortools/math_opt/solvers/gscip/gscip.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@
4747
#include "scip/cons_indicator.h"
4848
#include "scip/cons_linear.h"
4949
#include "scip/cons_or.h"
50+
#if SCIP_VERSION_MAJOR >= 10
51+
#include "scip/cons_nonlinear.h"
52+
#define SCIPcreateConsQuadratic SCIPcreateConsQuadraticNonlinear
53+
#else
5054
#include "scip/cons_quadratic.h"
55+
#endif // SCIP_VERSION_MAJOR >= 10
5156
#include "scip/cons_sos1.h"
5257
#include "scip/cons_sos2.h"
5358
#include "scip/def.h"

0 commit comments

Comments
 (0)