From 140e5bb5ee260bb73deefc9c7174b42ec75f3489 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 1 Jan 2026 15:40:12 +0000 Subject: [PATCH] fix build (sparkd): Disable warnings specifically for clang >= 18 The build was broken for clang < 18 (and gcc) because we were blindly disabling warnings as errors specific to clang 18, without checking the compiler version. Namely, "-Weffc++" and "-Wenum-constexpr-conversion". --- src/lib_spark/spark/logging/LogRec.h | 12 +++++++++--- src/lib_spark/spark/md/SecurityIndex.h | 10 +++++++--- src/lib_spark/spark/quickbus/network/QBConnection.h | 9 +++++++-- src/lib_spark/spark/utils/datetime.cpp | 10 +++++++--- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/lib_spark/spark/logging/LogRec.h b/src/lib_spark/spark/logging/LogRec.h index 751c90c9c..defd95740 100644 --- a/src/lib_spark/spark/logging/LogRec.h +++ b/src/lib_spark/spark/logging/LogRec.h @@ -2,7 +2,6 @@ #include "Common.h" #include "MsgPacking.h" -#include "spark/utils/warn_ctrl.h" namespace bts { namespace log { @@ -10,7 +9,11 @@ namespace log { using ArgUnpacker = std::string (*)(ArgBuffer const &b, const char *msg_template); -GCC_DIAG_OFF("-Weffc++") +#if defined(__clang__) and __clang_major__ >= 18 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Weffc++" +#endif + struct LogRec { uint64_t ts; const char *file; @@ -32,7 +35,10 @@ struct LogRec { std::string unpack_msg() { return unpacker(args, msg_template); } }; -GCC_DIAG_RESTORE() + +#if defined(__clang__) and __clang_major__ >= 18 +#pragma GCC diagnostic pop +#endif #ifndef _WIN32 // static_assert(sizeof(LogRec) == 256, "LogRec should be 128 bytes"); diff --git a/src/lib_spark/spark/md/SecurityIndex.h b/src/lib_spark/spark/md/SecurityIndex.h index 11ab4feee..9b2ddfcee 100644 --- a/src/lib_spark/spark/md/SecurityIndex.h +++ b/src/lib_spark/spark/md/SecurityIndex.h @@ -4,12 +4,16 @@ #include "spark/md/MDProducerHandle.h" #include "spark/md/common.h" #include "spark/utils/bts_no_copy.h" -#include "spark/utils/warn_ctrl.h" #include -GCC_DIAG_OFF("-Wenum-constexpr-conversion") +#if defined(__clang__) and __clang_major__ >= 18 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wenum-constexpr-conversion" #include -GCC_DIAG_RESTORE() +#pragma GCC diagnostic pop +#else +#include +#endif #include #include diff --git a/src/lib_spark/spark/quickbus/network/QBConnection.h b/src/lib_spark/spark/quickbus/network/QBConnection.h index abe38b22e..faf337588 100644 --- a/src/lib_spark/spark/quickbus/network/QBConnection.h +++ b/src/lib_spark/spark/quickbus/network/QBConnection.h @@ -3,9 +3,14 @@ #include "spark/quickbus/routing/INode.h" #include "spark/utils/warn_ctrl.h" -GCC_DIAG_OFF("-Wenum-constexpr-conversion") +#if defined(__clang__) and __clang_major__ >= 18 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wenum-constexpr-conversion" #include -GCC_DIAG_RESTORE() +#pragma GCC diagnostic pop +#else +#include +#endif #include #include diff --git a/src/lib_spark/spark/utils/datetime.cpp b/src/lib_spark/spark/utils/datetime.cpp index eafe0761d..97f16ec1f 100644 --- a/src/lib_spark/spark/utils/datetime.cpp +++ b/src/lib_spark/spark/utils/datetime.cpp @@ -2,11 +2,15 @@ #include "TimeStamp.h" #include "bts_assert.h" #include "spark/utils/datetime_common.h" -#include "spark/utils/warn_ctrl.h" -GCC_DIAG_OFF("-Wenum-constexpr-conversion") +#if defined(__clang__) and __clang_major__ >= 18 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wenum-constexpr-conversion" #include -GCC_DIAG_RESTORE() +#pragma GCC diagnostic pop +#else +#include +#endif #include #include #include