diff options
| -rw-r--r-- | src/test/validation_chainstatemanager_tests.cpp | 8 | ||||
| -rw-r--r-- | src/txmempool.h | 10 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/test/validation_chainstatemanager_tests.cpp b/src/test/validation_chainstatemanager_tests.cpp index 68563f9c7d..b07c70e107 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 { diff --git a/src/txmempool.h b/src/txmempool.h index 7fdf1c5a39..d0cb41a078 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> |