diff options
| author | 2020-08-15 02:14:11 -0400 | |
|---|---|---|
| committer | 2020-08-15 02:14:11 -0400 | |
| commit | 2b601e86360ea47df5b3cb1a280177f428763837 (patch) | |
| tree | 650bd7ad43701989bb87f06dc00e5c62fb50e0c3 /src/core/hle/service | |
| parent | Merge pull request #4527 from lioncash/pessimizing2 (diff) | |
| parent | core: Resolve several -Wextra-semi warnings (diff) | |
| download | yuzu-2b601e86360ea47df5b3cb1a280177f428763837.tar.gz yuzu-2b601e86360ea47df5b3cb1a280177f428763837.tar.xz yuzu-2b601e86360ea47df5b3cb1a280177f428763837.zip | |
Merge pull request #4526 from lioncash/core-semi
core: Resolve several -Wextra-semi warnings
Diffstat (limited to 'src/core/hle/service')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvdevice.h | 3 |
2 files changed, 4 insertions, 3 deletions
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) { | |||
| 90 | default: | 90 | default: |
| 91 | UNIMPLEMENTED_MSG("Unknown npad index {}", index); | 91 | UNIMPLEMENTED_MSG("Unknown npad index {}", index); |
| 92 | return 0; | 92 | return 0; |
| 93 | }; | 93 | } |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system), system(system) {} | 96 | Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system), system(system) {} |
| @@ -630,7 +630,7 @@ Controller_NPad::LedPattern Controller_NPad::GetLedPattern(u32 npad_id) { | |||
| 630 | default: | 630 | default: |
| 631 | UNIMPLEMENTED_MSG("Unhandled npad_id {}", npad_id); | 631 | UNIMPLEMENTED_MSG("Unhandled npad_id {}", npad_id); |
| 632 | return LedPattern{0, 0, 0, 0}; | 632 | return LedPattern{0, 0, 0, 0}; |
| 633 | }; | 633 | } |
| 634 | } | 634 | } |
| 635 | 635 | ||
| 636 | void Controller_NPad::SetVibrationEnabled(bool can_vibrate) { | 636 | 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 { | |||
| 21 | /// implement the ioctl interface. | 21 | /// implement the ioctl interface. |
| 22 | class nvdevice { | 22 | class nvdevice { |
| 23 | public: | 23 | public: |
| 24 | explicit nvdevice(Core::System& system) : system{system} {}; | 24 | explicit nvdevice(Core::System& system) : system{system} {} |
| 25 | virtual ~nvdevice() = default; | 25 | virtual ~nvdevice() = default; |
| 26 | |||
| 26 | union Ioctl { | 27 | union Ioctl { |
| 27 | u32_le raw; | 28 | u32_le raw; |
| 28 | BitField<0, 8, u32> cmd; | 29 | BitField<0, 8, u32> cmd; |