From 7d01f433cff6110e1ee3cd71d37e350cf8acc6f9 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Wed, 25 Oct 2023 14:47:24 +0200
Subject: [PATCH] dependencies: Bump SCIP to v804

---
 Dependencies.txt                  | 2 +-
 WORKSPACE                         | 2 +-
 bazel/scip.BUILD                  | 2 +-
 cmake/dependencies/CMakeLists.txt | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dependencies.txt b/Dependencies.txt
index 7486ceb107..4d32194d17 100644
--- a/Dependencies.txt
+++ b/Dependencies.txt
@@ -8,4 +8,4 @@ CoinUtils=2.11.6
 Eigen=3.4.0
 Re2=2023-08-01
 HiGHS=v1.6.0
-Scip=v803
+Scip=v804
diff --git a/WORKSPACE b/WORKSPACE
index 85c8e4367d..56f4143cdf 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -131,7 +131,7 @@ new_git_repository(
     build_file = "//bazel:scip.BUILD",
     patches = ["//bazel:scip.patch"],
     patch_args = ["-p1"],
-    tag = "v803",
+    tag = "v804",
     remote = "https://github.com/scipopt/scip.git",
 )
 
diff --git a/bazel/scip.BUILD b/bazel/scip.BUILD
index a0e1c17b5b..1810e2991a 100644
--- a/bazel/scip.BUILD
+++ b/bazel/scip.BUILD
@@ -93,7 +93,7 @@ cc_library(
         "-DSCIP_WITH_ZLIB",
         "-DWITH_SCIPDEF",
         "-DSCIP_ROUNDING_FE",
-        "-DTPI_TNYC",  # src/tpi/type_tpi_tnycthrd.h
+        "-DTPI_TNY",  # src/tpi/type_tpi_tnycthrd.h
         # Compile in thead-safe mode (required since we use TPI_TNYC). Note,
         # one does not technically need to add this, as SCIP code always
         # uses syntax like "#ifndef NPARASCIP". But let's be explicit here.
diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
index ffba3c53bb..74a0711b50 100644
--- a/cmake/dependencies/CMakeLists.txt
+++ b/cmake/dependencies/CMakeLists.txt
@@ -245,8 +245,8 @@ if(BUILD_SCIP)
   FetchContent_Declare(
     scip
     GIT_REPOSITORY "https://github.com/scipopt/scip.git"
-    GIT_TAG        "v803"
-    #PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v803.patch"
+    GIT_TAG        "v804"
+    #PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v804.patch"
   )
   FetchContent_MakeAvailable(scip)
   set(LPI_GLOP_SRC ${scip_SOURCE_DIR}/src/lpi/lpi_glop.cpp PARENT_SCOPE)