diff options
| author | bunnei <bunneidev@gmail.com> | 2020-12-02 23:08:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 23:08:43 -0800 |
| commit | 88089c87546b62536a27738f5ee03dff52fa76e9 (patch) | |
| tree | 5221c80d0ac3e7bbdb0c342098378e6c84951658 /src/audio_core/voice_context.h | |
| parent | 9abb23cd2700b57611fc25bce67581eaa6d4d3b7 (diff) | |
| parent | 1ea6bdef058a789e2771511f741bffcca73c3525 (diff) | |
Merge pull request #5000 from lioncash/audio-error
audio_core: Make shadowing and unused parameters errors
Diffstat (limited to 'src/audio_core/voice_context.h')
| -rw-r--r-- | src/audio_core/voice_context.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio_core/voice_context.h b/src/audio_core/voice_context.h index 59d3d7dfbe..863248761a 100644 --- a/src/audio_core/voice_context.h +++ b/src/audio_core/voice_context.h @@ -118,12 +118,12 @@ public: bool in_use{}; INSERT_PADDING_BYTES(11); }; - static_assert(sizeof(VoiceChannelResource::InParams) == 0x70, "InParams is an invalid size"); + static_assert(sizeof(InParams) == 0x70, "InParams is an invalid size"); }; class ServerVoiceChannelResource { public: - explicit ServerVoiceChannelResource(s32 id); + explicit ServerVoiceChannelResource(s32 id_); ~ServerVoiceChannelResource(); bool InUse() const; @@ -174,7 +174,7 @@ public: BehaviorFlags behavior_flags{}; INSERT_PADDING_BYTES(16); }; - static_assert(sizeof(VoiceInfo::InParams) == 0x170, "InParams is an invalid size"); + static_assert(sizeof(InParams) == 0x170, "InParams is an invalid size"); struct OutParams { u64_le played_sample_count{}; @@ -182,7 +182,7 @@ public: u8 voice_dropped{}; INSERT_PADDING_BYTES(3); }; - static_assert(sizeof(VoiceInfo::OutParams) == 0x10, "OutParams is an invalid size"); + static_assert(sizeof(OutParams) == 0x10, "OutParams is an invalid size"); }; class ServerVoiceInfo { @@ -263,7 +263,7 @@ private: class VoiceContext { public: - VoiceContext(std::size_t voice_count); + explicit VoiceContext(std::size_t voice_count_); ~VoiceContext(); std::size_t GetVoiceCount() const; |