From c0f7f91507cad62d893b796121f1898859fb7c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 28 Nov 2020 21:09:26 +0100 Subject: [PATCH] Core: Fix an assertion that mistakenly uses a fmt format string Unfortunately, adding a DEBUG_ASSERT_MSG_FMT isn't actually possible right now because of compiler bugs: https://github.com/dolphin-emu/dolphin/pull/9284 We could require a newer version of GCC (10) but that would require updating GCC on the build machines. For what it's worth, older versions of GCC (8, 9) are broken in many ways: adding constexpr to some Matrix functions causes GCC 8 to generate bugged code that causes the Wii IR pointer to disappear, which means that the generated builds are already unusable (see https://dolp.in/i12324). Additionally, we've already had to add workarounds for those versions in the format macros to fix compilation bugs. This time, it looks like workarounds won't cut it; even applying the workaround described in https://github.com/fmtlib/fmt/pull/1580 does not help. --- Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp index 61767b75a2..76f0ee89c7 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp @@ -611,7 +611,7 @@ void WiimoteDevice::ReceiveConfigurationReq(u8 ident, u8* data, u32 size) break; default: - DEBUG_ASSERT_MSG(IOS_WIIMOTE, 0, "Unknown Option: {:#04x}", options->type); + DEBUG_ASSERT_MSG(IOS_WIIMOTE, 0, "Unknown Option: 0x%02x", options->type); break; }