diff options
| author | 2022-10-23 17:25:18 -0700 | |
|---|---|---|
| committer | 2022-10-23 17:25:18 -0700 | |
| commit | 0313ee77936a696f9135a31ac0b644e6ffe49ae8 (patch) | |
| tree | b9e4a934447468338c60add33375409341f5bc7d /src/core/hle | |
| parent | Merge pull request #9095 from FernandoS27/meat-good-vegetable-bad (diff) | |
| parent | CMakeLists: Disable -Wbraced-scalar-init on Clang (diff) | |
| download | yuzu-0313ee77936a696f9135a31ac0b644e6ffe49ae8.tar.gz yuzu-0313ee77936a696f9135a31ac0b644e6ffe49ae8.tar.xz yuzu-0313ee77936a696f9135a31ac0b644e6ffe49ae8.zip | |
Merge pull request #9105 from Morph1984/warnings
general: Treat more warnings as errors
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/ipc_helpers.h | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/applets.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 20 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h index aa27be767..18fde8bd6 100644 --- a/src/core/hle/ipc_helpers.h +++ b/src/core/hle/ipc_helpers.h | |||
| @@ -406,7 +406,7 @@ inline s32 RequestParser::Pop() { | |||
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | // Ignore the -Wclass-memaccess warning on memcpy for non-trivially default constructible objects. | 408 | // Ignore the -Wclass-memaccess warning on memcpy for non-trivially default constructible objects. |
| 409 | #if defined(__GNUC__) | 409 | #if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) |
| 410 | #pragma GCC diagnostic push | 410 | #pragma GCC diagnostic push |
| 411 | #pragma GCC diagnostic ignored "-Wclass-memaccess" | 411 | #pragma GCC diagnostic ignored "-Wclass-memaccess" |
| 412 | #endif | 412 | #endif |
| @@ -417,7 +417,7 @@ void RequestParser::PopRaw(T& value) { | |||
| 417 | std::memcpy(&value, cmdbuf + index, sizeof(T)); | 417 | std::memcpy(&value, cmdbuf + index, sizeof(T)); |
| 418 | index += (sizeof(T) + 3) / 4; // round up to word length | 418 | index += (sizeof(T) + 3) / 4; // round up to word length |
| 419 | } | 419 | } |
| 420 | #if defined(__GNUC__) | 420 | #if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) |
| 421 | #pragma GCC diagnostic pop | 421 | #pragma GCC diagnostic pop |
| 422 | #endif | 422 | #endif |
| 423 | 423 | ||
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index b07ae3f02..4aca5b27d 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -751,8 +751,8 @@ static void Break(Core::System& system, u32 reason, u64 info1, u64 info2) { | |||
| 751 | } | 751 | } |
| 752 | 752 | ||
| 753 | system.GetReporter().SaveSvcBreakReport( | 753 | system.GetReporter().SaveSvcBreakReport( |
| 754 | static_cast<u32>(break_reason.break_type.Value()), break_reason.signal_debugger, info1, | 754 | static_cast<u32>(break_reason.break_type.Value()), break_reason.signal_debugger.As<bool>(), |
| 755 | info2, has_dumped_buffer ? std::make_optional(debug_buffer) : std::nullopt); | 755 | info1, info2, has_dumped_buffer ? std::make_optional(debug_buffer) : std::nullopt); |
| 756 | 756 | ||
| 757 | if (!break_reason.signal_debugger) { | 757 | if (!break_reason.signal_debugger) { |
| 758 | LOG_CRITICAL( | 758 | LOG_CRITICAL( |
diff --git a/src/core/hle/service/am/applets/applets.h b/src/core/hle/service/am/applets/applets.h index e78a57657..12c6a5b1a 100644 --- a/src/core/hle/service/am/applets/applets.h +++ b/src/core/hle/service/am/applets/applets.h | |||
| @@ -164,7 +164,7 @@ protected: | |||
| 164 | u32_le size; | 164 | u32_le size; |
| 165 | u32_le library_version; | 165 | u32_le library_version; |
| 166 | u32_le theme_color; | 166 | u32_le theme_color; |
| 167 | u8 play_startup_sound; | 167 | bool play_startup_sound; |
| 168 | u64_le system_tick; | 168 | u64_le system_tick; |
| 169 | }; | 169 | }; |
| 170 | static_assert(sizeof(CommonArguments) == 0x20, "CommonArguments has incorrect size."); | 170 | static_assert(sizeof(CommonArguments) == 0x20, "CommonArguments has incorrect size."); |
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index ba8a1f786..3b26e96de 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp | |||
| @@ -1502,25 +1502,25 @@ bool Controller_NPad::IsControllerSupported(Core::HID::NpadStyleIndex controller | |||
| 1502 | Core::HID::NpadStyleTag style = GetSupportedStyleSet(); | 1502 | Core::HID::NpadStyleTag style = GetSupportedStyleSet(); |
| 1503 | switch (controller) { | 1503 | switch (controller) { |
| 1504 | case Core::HID::NpadStyleIndex::ProController: | 1504 | case Core::HID::NpadStyleIndex::ProController: |
| 1505 | return style.fullkey; | 1505 | return style.fullkey.As<bool>(); |
| 1506 | case Core::HID::NpadStyleIndex::JoyconDual: | 1506 | case Core::HID::NpadStyleIndex::JoyconDual: |
| 1507 | return style.joycon_dual; | 1507 | return style.joycon_dual.As<bool>(); |
| 1508 | case Core::HID::NpadStyleIndex::JoyconLeft: | 1508 | case Core::HID::NpadStyleIndex::JoyconLeft: |
| 1509 | return style.joycon_left; | 1509 | return style.joycon_left.As<bool>(); |
| 1510 | case Core::HID::NpadStyleIndex::JoyconRight: | 1510 | case Core::HID::NpadStyleIndex::JoyconRight: |
| 1511 | return style.joycon_right; | 1511 | return style.joycon_right.As<bool>(); |
| 1512 | case Core::HID::NpadStyleIndex::GameCube: | 1512 | case Core::HID::NpadStyleIndex::GameCube: |
| 1513 | return style.gamecube; | 1513 | return style.gamecube.As<bool>(); |
| 1514 | case Core::HID::NpadStyleIndex::Pokeball: | 1514 | case Core::HID::NpadStyleIndex::Pokeball: |
| 1515 | return style.palma; | 1515 | return style.palma.As<bool>(); |
| 1516 | case Core::HID::NpadStyleIndex::NES: | 1516 | case Core::HID::NpadStyleIndex::NES: |
| 1517 | return style.lark; | 1517 | return style.lark.As<bool>(); |
| 1518 | case Core::HID::NpadStyleIndex::SNES: | 1518 | case Core::HID::NpadStyleIndex::SNES: |
| 1519 | return style.lucia; | 1519 | return style.lucia.As<bool>(); |
| 1520 | case Core::HID::NpadStyleIndex::N64: | 1520 | case Core::HID::NpadStyleIndex::N64: |
| 1521 | return style.lagoon; | 1521 | return style.lagoon.As<bool>(); |
| 1522 | case Core::HID::NpadStyleIndex::SegaGenesis: | 1522 | case Core::HID::NpadStyleIndex::SegaGenesis: |
| 1523 | return style.lager; | 1523 | return style.lager.As<bool>(); |
| 1524 | default: | 1524 | default: |
| 1525 | return false; | 1525 | return false; |
| 1526 | } | 1526 | } |