diff options
| author |  bunnei | 2022-09-28 14:37:23 -0700 |
|---|---|---|
| committer |  GitHub | 2022-09-28 14:37:23 -0700 |
| commit | 9015a512c275e8d7979715632bf5ae67fe3adf2f (patch) | |
| tree | 1bf9bb4098fd6533280b314745d9fb329f6ec1ca /src/core | |
| parent | Merge pull request #8989 from merryhime/loader-nullptr (diff) | |
| parent | yuzu: Silence some clang warnings (diff) | |
| download | yuzu-9015a512c275e8d7979715632bf5ae67fe3adf2f.tar.gz yuzu-9015a512c275e8d7979715632bf5ae67fe3adf2f.tar.xz yuzu-9015a512c275e8d7979715632bf5ae67fe3adf2f.zip | |
Merge pull request #8940 from german77/silence
yuzu: Silence some clang warnings
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/hid/irs.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp index c4b44cbf9..6a3453457 100644 --- a/src/core/hle/service/hid/irs.cpp +++ b/src/core/hle/service/hid/irs.cpp | |||
| @@ -542,7 +542,8 @@ Result IRS::IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_h | |||
| 542 | 542 | ||
| 543 | Core::IrSensor::DeviceFormat& IRS::GetIrCameraSharedMemoryDeviceEntry( | 543 | Core::IrSensor::DeviceFormat& IRS::GetIrCameraSharedMemoryDeviceEntry( |
| 544 | const Core::IrSensor::IrCameraHandle& camera_handle) { | 544 | const Core::IrSensor::IrCameraHandle& camera_handle) { |
| 545 | ASSERT_MSG(sizeof(StatusManager::device) > camera_handle.npad_id, "invalid npad_id"); | 545 | const auto npad_id_max_index = static_cast<u8>(sizeof(StatusManager::device)); |
| 546 | ASSERT_MSG(camera_handle.npad_id < npad_id_max_index, "invalid npad_id"); | ||
| 546 | return shared_memory->device[camera_handle.npad_id]; | 547 | return shared_memory->device[camera_handle.npad_id]; |
| 547 | } | 548 | } |
| 548 | 549 | ||