From fa3ecdf778bcde7713004ff8bb86d3fdfc916969 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Fri, 6 Sep 2024 15:58:40 +0200
Subject: [PATCH 1/2] Revert "build: work around issue with Boost <= 1.80 and
 Clang >= 18"

This reverts commit cd062d6684908d526be7423f8f1057b891254a3c.
---
 src/txmempool.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/txmempool.h b/src/txmempool.h
index 7fdf1c5a39ae9..d0cb41a078ec2 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -23,17 +23,7 @@
 #include <util/result.h>
 #include <util/feefrac.h>
 
-// This works around a bug in Boost <= 1.80.0 when using Clang >=18.
-// See https://github.com/bitcoin/bitcoin/issues/30751.
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wenum-constexpr-conversion"
-#endif
 #include <boost/multi_index/hashed_index.hpp>
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 #include <boost/multi_index/identity.hpp>
 #include <boost/multi_index/indexed_by.hpp>
 #include <boost/multi_index/ordered_index.hpp>

From fa9d7d5d205ada8915cbbc29599ab8e7bf1fffe0 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Fri, 6 Sep 2024 16:03:48 +0200
Subject: [PATCH 2/2] test: Work around boost compilation error

---
 src/test/validation_chainstatemanager_tests.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/validation_chainstatemanager_tests.cpp b/src/test/validation_chainstatemanager_tests.cpp
index 68563f9c7d5e6..b07c70e1070c6 100644
--- a/src/test/validation_chainstatemanager_tests.cpp
+++ b/src/test/validation_chainstatemanager_tests.cpp
@@ -155,10 +155,10 @@ BOOST_FIXTURE_TEST_CASE(chainstatemanager_rebalance_caches, TestChain100Setup)
         manager.MaybeRebalanceCaches();
     }
 
-    BOOST_CHECK_CLOSE(c1.m_coinstip_cache_size_bytes, max_cache * 0.05, 1);
-    BOOST_CHECK_CLOSE(c1.m_coinsdb_cache_size_bytes, max_cache * 0.05, 1);
-    BOOST_CHECK_CLOSE(c2.m_coinstip_cache_size_bytes, max_cache * 0.95, 1);
-    BOOST_CHECK_CLOSE(c2.m_coinsdb_cache_size_bytes, max_cache * 0.95, 1);
+    BOOST_CHECK_CLOSE(double(c1.m_coinstip_cache_size_bytes), max_cache * 0.05, 1);
+    BOOST_CHECK_CLOSE(double(c1.m_coinsdb_cache_size_bytes), max_cache * 0.05, 1);
+    BOOST_CHECK_CLOSE(double(c2.m_coinstip_cache_size_bytes), max_cache * 0.95, 1);
+    BOOST_CHECK_CLOSE(double(c2.m_coinsdb_cache_size_bytes), max_cache * 0.95, 1);
 }
 
 struct SnapshotTestSetup : TestChain100Setup {