From 340c4d3383bf27bd1279652660c0ab6643facc78 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Mon, 20 Mar 2023 00:28:36 +0100 Subject: [PATCH] Fix compile error in SpdLog Added check for older compilers to prevent the error 'C2131' (expression did not evaluate to a constant). --- r5dev/thirdparty/spdlog/fmt/bundled/core.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/core.h b/r5dev/thirdparty/spdlog/fmt/bundled/core.h index f6a37af9..8e39b70b 100644 --- a/r5dev/thirdparty/spdlog/fmt/bundled/core.h +++ b/r5dev/thirdparty/spdlog/fmt/bundled/core.h @@ -3004,7 +3004,14 @@ void check_format_string(S format_str) { FMT_CONSTEXPR auto s = basic_string_view(format_str); using checker = format_string_checker...>; - FMT_CONSTEXPR bool invalid_format = + +#if (FMT_MSC_VERSION == 0 || FMT_MSC_VERSION > 1913) + FMT_CONSTEXPR +#else + // Don't qualify as constexpr as older visual studio compilers will + // throw the error C2131 'expression did not evaluate to a constant'. +#endif + bool invalid_format = (parse_format_string(s, checker(s, {})), true); ignore_unused(invalid_format); }