From fab1a62c870e5bac92ee89b8444fd5910dfd5034 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Fri, 31 Jul 2026 08:35:45 +0200 Subject: [PATCH] refactor: Use inline constexpr for string literals in headers This is needed for the next scripted-diff commit, which would otherwise turn the const from `static const char*` into `inline const char*`. --- src/index/blockfilterindex.h | 2 +- src/univalue/include/univalue_escapes.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index/blockfilterindex.h b/src/index/blockfilterindex.h index 77b87ff4765..12b5741138d 100644 --- a/src/index/blockfilterindex.h +++ b/src/index/blockfilterindex.h @@ -25,7 +25,7 @@ class BlockFilter; class CBlockIndex; enum class BlockFilterType : uint8_t; -static const char* const DEFAULT_BLOCKFILTERINDEX = "0"; +inline constexpr const char* DEFAULT_BLOCKFILTERINDEX{"0"}; /** Interval between compact filter checkpoints. See BIP 157. */ inline constexpr int CFCHECKPT_INTERVAL = 1000; diff --git a/src/univalue/include/univalue_escapes.h b/src/univalue/include/univalue_escapes.h index 7f4d89b09dc..edce915c7d0 100644 --- a/src/univalue/include/univalue_escapes.h +++ b/src/univalue/include/univalue_escapes.h @@ -5,7 +5,7 @@ #ifndef BITCOIN_UNIVALUE_INCLUDE_UNIVALUE_ESCAPES_H #define BITCOIN_UNIVALUE_INCLUDE_UNIVALUE_ESCAPES_H -static const char *escapes[256] = { +inline constexpr const char* escapes[256]{ "\\u0000", "\\u0001", "\\u0002",