ortools-clone/bazel/scip.patch

diff --git a/src/scip/buildflags.c b/src/scip/buildflags.c
index 4fbbc0e3b..3dc550347 100644
--- src/scip/buildflags.c
+++ src/scip/buildflags.c
@@ -0,0 +1,2 @@
+#define SCIP_BUILDFLAGS " ARCH=x86_64\n COMP=gnu\n DEBUGSOL=false\n EXPRINT=none\n GAMS=false\n SYM=bliss\n GMP=false\n IPOPT=false\n IPOPTOPT=opt\n WORHP=false\n WORHPOPT=opt\n LPS=spx2\n LPSCHECK=false\n LPSOPT=opt\n NOBLKBUFMEM=false\n NOBLKMEM=false\n NOBUFMEM=false\n OPT=opt\n OSTYPE=linux\n PARASCIP=true\n READLINE=false\n SANITIZE=\n SHARED=false\n USRARFLAGS=\n USRCFLAGS=-fPIC\n USRCXXFLAGS=-fPIC\n USRDFLAGS=\n USRFLAGS=\n USRLDFLAGS=\n USROFLAGS=\n VERSION=7.0.1\n ZIMPL=false\n ZIMPLOPT=opt\n ZLIB=true"
+
diff --git a/src/scip/githash.c b/src/scip/githash.c
new file mode 100644
index 000000000..660dc1976
--- /dev/null
+++ src/scip/githash.c
@@ -0,0 +1 @@
+#define SCIP_GITHASH "b41d526acf"
diff --git a/src/symmetry/compute_symmetry_bliss.cpp b/src/symmetry/compute_symmetry_bliss.cpp
index db734cb18..2fda08fd4 100644
--- src/symmetry/compute_symmetry_bliss.cpp
+++ src/symmetry/compute_symmetry_bliss.cpp
@@ -24,8 +24,8 @@
 #include "compute_symmetry.h"

 /* include bliss graph */
-#include <bliss/defs.hh>
-#include <bliss/graph.hh>
+#include <bliss-0.73/defs.hh>
+#include <bliss-0.73/graph.hh>

 #include <vector>
 #include <list>

diff --git a/src/nlpi/nlpi_xyz.c b/src/nlpi/nlpi_xyz.c
index c66511862a..3058216088 100644
--- src/nlpi/nlpi_xyz.c
+++ src/nlpi/nlpi_xyz.c
@@ -43,12 +43,14 @@

 struct SCIP_NlpiData
 {
+       void* ptr;
 };

 /* TODO: fill in the necessary NLP problem instance data */

 struct SCIP_NlpiProblem
 {
+       void* ptr;
 };


diff --git a/src/scip/benders_xyz.c b/src/scip/benders_xyz.c
index b3a2b710f0..e3e8397ff5 100644
--- src/scip/benders_xyz.c
+++ src/scip/benders_xyz.c
@@ -47,6 +47,7 @@
 /** Benders' decomposition data */
 struct SCIP_BendersData
 {
+       void* ptr;
 };


diff --git a/src/scip/benderscut_xyz.c b/src/scip/benderscut_xyz.c
index 394685e225..0c08fe8b84 100644
--- src/scip/benderscut_xyz.c
+++ src/scip/benderscut_xyz.c
@@ -41,6 +41,7 @@
 /** Benders' decomposition cut data */
 struct SCIP_BenderscutData
 {
+       void* ptr;
 };


diff --git a/src/scip/branch_xyz.c b/src/scip/branch_xyz.c
index a5e7f0f9a2..4970df6cce 100644
--- src/scip/branch_xyz.c
+++ src/scip/branch_xyz.c
@@ -42,6 +42,7 @@
 /** branching rule data */
 struct SCIP_BranchruleData
 {
+       void* ptr;
 };


diff --git a/src/scip/cons_xyz.c b/src/scip/cons_xyz.c
index af256c5485..7fe813a22d 100644
--- src/scip/cons_xyz.c
+++ src/scip/cons_xyz.c
@@ -69,11 +69,13 @@
 /** constraint data for xyz constraints */
 struct SCIP_ConsData
 {
+       void* ptr;
 };

 /** constraint handler data */
 struct SCIP_ConshdlrData
 {
+       void* ptr;
 };


diff --git a/src/scip/dialog_xyz.c b/src/scip/dialog_xyz.c
index f00d44d9ea..3aee42b2dd 100644
--- src/scip/dialog_xyz.c
+++ src/scip/dialog_xyz.c
@@ -42,6 +42,7 @@
 /** dialog data */
 struct SCIP_DialogData
 {
+       void* ptr;
 };


diff --git a/src/scip/disp_xyz.c b/src/scip/disp_xyz.c
index 073f192aa6..fa0e7e970c 100644
--- src/scip/disp_xyz.c
+++ src/scip/disp_xyz.c
@@ -47,6 +47,7 @@
 /** display column data */
 struct SCIP_DispData
 {
+       void* ptr;
 };


diff --git a/src/scip/event_xyz.c b/src/scip/event_xyz.c
index 04cade95d8..58ad82f06b 100644
--- src/scip/event_xyz.c
+++ src/scip/event_xyz.c
@@ -36,6 +36,7 @@
 /** event handler data */
 struct SCIP_EventhdlrData
 {
+       void* ptr;
 };

 /*
 diff --git a/src/scip/heur_xyz.c b/src/scip/heur_xyz.c
index 8bc7c4f953..c45035611f 100644
--- src/scip/heur_xyz.c
+++ src/scip/heur_xyz.c
@@ -46,6 +46,7 @@
 /** primal heuristic data */
 struct SCIP_HeurData
 {
+       void* ptr;
 };


diff --git a/src/scip/nodesel_xyz.c b/src/scip/nodesel_xyz.c
index a5139e5f9a..4009fe7793 100644
--- src/scip/nodesel_xyz.c
+++ src/scip/nodesel_xyz.c
@@ -41,6 +41,7 @@
 /** node selector data */
 struct SCIP_NodeselData
 {
+       void* ptr;
 };


diff --git a/src/scip/pricer_xyz.c b/src/scip/pricer_xyz.c
index c3bbbff655..5bc6ca4795 100644
--- src/scip/pricer_xyz.c
+++ src/scip/pricer_xyz.c
@@ -43,6 +43,7 @@
 /** variable pricer data */
 struct SCIP_PricerData
 {
+       void* ptr;
 };


diff --git a/src/scip/presol_xyz.c b/src/scip/presol_xyz.c
index 84ce50bb08..49d6e8f368 100644
--- src/scip/presol_xyz.c
+++ src/scip/presol_xyz.c
@@ -42,6 +42,7 @@
 /** presolver data */
 struct SCIP_PresolData
 {
+       void* ptr;
 };


diff --git a/src/scip/prop_xyz.c b/src/scip/prop_xyz.c
index d07b374fc3..5313a5643f 100644
--- src/scip/prop_xyz.c
+++ src/scip/prop_xyz.c
@@ -50,6 +50,7 @@
 /** propagator data */
 struct SCIP_PropData
 {
+       void* ptr;
 };


diff --git a/src/scip/reader_xyz.c b/src/scip/reader_xyz.c
index 45720677ed..8cf3799639 100644
--- src/scip/reader_xyz.c
+++ src/scip/reader_xyz.c
@@ -40,6 +40,7 @@
 /** data for xyz reader */
 struct SCIP_ReaderData
 {
+       void* ptr;
 };


diff --git a/src/scip/relax_xyz.c b/src/scip/relax_xyz.c
index 30b0999de4..afdbe5b076 100644
--- src/scip/relax_xyz.c
+++ src/scip/relax_xyz.c
@@ -43,6 +43,7 @@
 /** relaxator data */
 struct SCIP_RelaxData
 {
+       void* ptr;
 };


diff --git a/src/scip/sepa_xyz.c b/src/scip/sepa_xyz.c
index 930ee78b3d..b25fed4dd7 100644
--- src/scip/sepa_xyz.c
+++ src/scip/sepa_xyz.c
@@ -44,6 +44,7 @@
 /** separator data */
 struct SCIP_SepaData
 {
+       void* ptr;
 };


diff --git a/src/scip/table_xyz.c b/src/scip/table_xyz.c
index 5d479de8a4..61e1307d0d 100644
--- src/scip/table_xyz.c
+++ src/scip/table_xyz.c
@@ -43,6 +43,7 @@
 /** statistics table data */
 struct SCIP_TableData
 {
+       void* ptr;
 };