From be56eac8115779b1572e7d362f4b856797aeb326 Mon Sep 17 00:00:00 2001 From: ergo720 <45463469+ergo720@users.noreply.github.com> Date: Tue, 12 Oct 2021 17:02:07 +0200 Subject: [PATCH] Fixed constexpr function never produces a constant expression [-Winvalid-constexpr] --- src/common/Logging.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/Logging.h b/src/common/Logging.h index 687e86e71..532610949 100644 --- a/src/common/Logging.h +++ b/src/common/Logging.h @@ -293,8 +293,8 @@ constexpr const char* remove_prefix(const char* str, const char *prefix) { return (str_skip_prefix(str, prefix) == str + str_length(prefix)) ? str_skip_prefix(str, prefix) : str; } -static const char* xbox_prefix = "xbox::"; -static const char* emupatch_prefix = "EmuPatch_"; // See #define EMUPATCH +static constexpr const char* xbox_prefix = "xbox::"; +static constexpr const char* emupatch_prefix = "EmuPatch_"; // See #define EMUPATCH constexpr const char* remove_emupatch_prefix(const char* str) { // return an empty string when str isn't given