diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-08-14 15:04:44 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-08-14 15:09:20 +0200 |
| commit | 2296e921d261857f4cb54efdad779f1f4626270d (patch) | |
| tree | b4799cd5513bc20c18a1bc3b168b61a9f728e602 /src/core/hle | |
| parent | Merge pull request #4495 from lioncash/conv (diff) | |
| download | yuzu-2296e921d261857f4cb54efdad779f1f4626270d.tar yuzu-2296e921d261857f4cb54efdad779f1f4626270d.tar.gz yuzu-2296e921d261857f4cb54efdad779f1f4626270d.tar.bz2 yuzu-2296e921d261857f4cb54efdad779f1f4626270d.tar.lz yuzu-2296e921d261857f4cb54efdad779f1f4626270d.tar.xz yuzu-2296e921d261857f4cb54efdad779f1f4626270d.tar.zst yuzu-2296e921d261857f4cb54efdad779f1f4626270d.zip | |
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/result.h | 12 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvdevice.h | 3 |
3 files changed, 12 insertions, 7 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 450f61fea..b6bdbd988 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -342,8 +342,9 @@ ResultVal<std::remove_reference_t<Arg>> MakeResult(Arg&& arg) { */ #define CASCADE_RESULT(target, source) \ auto CONCAT2(check_result_L, __LINE__) = source; \ - if (CONCAT2(check_result_L, __LINE__).Failed()) \ + if (CONCAT2(check_result_L, __LINE__).Failed()) { \ return CONCAT2(check_result_L, __LINE__).Code(); \ + } \ target = std::move(*CONCAT2(check_result_L, __LINE__)) /** @@ -351,6 +352,9 @@ ResultVal<std::remove_reference_t<Arg>> MakeResult(Arg&& arg) { * non-success, or discarded otherwise. */ #define CASCADE_CODE(source) \ - auto CONCAT2(check_result_L, __LINE__) = source; \ - if (CONCAT2(check_result_L, __LINE__).IsError()) \ - return CONCAT2(check_result_L, __LINE__); + do { \ + auto CONCAT2(check_result_L, __LINE__) = source; \ + if (CONCAT2(check_result_L, __LINE__).IsError()) { \ + return CONCAT2(check_result_L, __LINE__); \ + } \ + } while (false) diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index ef67ad690..0e7794dc7 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -90,7 +90,7 @@ u32 Controller_NPad::IndexToNPad(std::size_t index) { default: UNIMPLEMENTED_MSG("Unknown npad index {}", index); return 0; - }; + } } Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system), system(system) {} @@ -630,7 +630,7 @@ Controller_NPad::LedPattern Controller_NPad::GetLedPattern(u32 npad_id) { default: UNIMPLEMENTED_MSG("Unhandled npad_id {}", npad_id); return LedPattern{0, 0, 0, 0}; - }; + } } void Controller_NPad::SetVibrationEnabled(bool can_vibrate) { diff --git a/src/core/hle/service/nvdrv/devices/nvdevice.h b/src/core/hle/service/nvdrv/devices/nvdevice.h index 1b52511a5..0240d6643 100644 --- a/src/core/hle/service/nvdrv/devices/nvdevice.h +++ b/src/core/hle/service/nvdrv/devices/nvdevice.h @@ -21,8 +21,9 @@ namespace Service::Nvidia::Devices { /// implement the ioctl interface. class nvdevice { public: - explicit nvdevice(Core::System& system) : system{system} {}; + explicit nvdevice(Core::System& system) : system{system} {} virtual ~nvdevice() = default; + union Ioctl { u32_le raw; BitField<0, 8, u32> cmd; |