From cd40133aa43ea9416852b40317fe57a9eaaab09e Mon Sep 17 00:00:00 2001 From: echosys Date: Sat, 10 Aug 2024 12:53:04 +0000 Subject: [PATCH] Be more explicit on struct init (#46) Older versions of gcc (gcc-11 which is used in the build guide) seem to struggle with these two struct initializations (if I understand this correctly it is using "designated initialization" which is new in C++20) leading to compile errors (see #42). This replaces those two initializations with a more explicit one that also compiles on gcc-11. Reviewed-on: http://vub63vv26q6v27xzv2dtcd25xumubshogm67yrpaz2rculqxs7jlfqad.onion/torzu-emu/torzu/pulls/46 Co-authored-by: echosys Co-committed-by: echosys --- src/core/hle/service/set/system_settings_server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/set/system_settings_server.cpp b/src/core/hle/service/set/system_settings_server.cpp index ff60b95b59..b87a4a1d7c 100644 --- a/src/core/hle/service/set/system_settings_server.cpp +++ b/src/core/hle/service/set/system_settings_server.cpp @@ -942,14 +942,14 @@ Result ISystemSettingsServer::SetPrimaryAlbumStorage(PrimaryAlbumStorage primary Result ISystemSettingsServer::GetBatteryLot(Out out_battery_lot) { LOG_INFO(Service_SET, "called"); - *out_battery_lot = {"YUZU0EMULATOR14022024"}; + *out_battery_lot = BatteryLot{"YUZU0EMULATOR14022024"}; R_SUCCEED(); } Result ISystemSettingsServer::GetSerialNumber(Out out_console_serial) { LOG_INFO(Service_SET, "called"); - *out_console_serial = {"YUZ10000000001"}; + *out_console_serial = SerialNumber{"YUZ10000000001"}; R_SUCCEED(); }