From c840c98e9e19342f430b25723d78be9cdd04441e Mon Sep 17 00:00:00 2001 From: oltolm Date: Mon, 8 Dec 2025 11:43:15 +0100 Subject: [PATCH] bit_set.h: forward declare fmt_unveil This change is necessary to fix the following clangd error in `StrFmt.h` Redefinition of 'fmt_unveil'clang(redefinition) bit_set.h(388, 8): Previous definition is here --- Utilities/bit_set.h | 4 +++- rpcs3/Crypto/utils.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Utilities/bit_set.h b/Utilities/bit_set.h index 8b98ae0fd4..9fdbf15de1 100644 --- a/Utilities/bit_set.h +++ b/Utilities/bit_set.h @@ -23,7 +23,6 @@ Intersection (&) and symmetric difference (^) is also available. #include "util/types.hpp" #include "util/atomic.hpp" -#include "Utilities/StrFmt.h" template concept BitSetEnum = std::is_enum_v && requires(T x) @@ -384,6 +383,9 @@ public: } }; +template +struct fmt_unveil; + template struct fmt_unveil> { diff --git a/rpcs3/Crypto/utils.cpp b/rpcs3/Crypto/utils.cpp index 8d2fd4e9aa..71f687bf83 100644 --- a/rpcs3/Crypto/utils.cpp +++ b/rpcs3/Crypto/utils.cpp @@ -12,6 +12,7 @@ #include #include #include +#include "Utilities/StrFmt.h" #include "Utilities/StrUtil.h" #include "Utilities/File.h"