diff options
| author | 2021-05-02 22:14:15 -0400 | |
|---|---|---|
| committer | 2021-05-03 01:19:13 -0400 | |
| commit | ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b (patch) | |
| tree | 024cebd87e461cc8212810576b0e759321911f1f /src/core/core_timing.cpp | |
| parent | Merge pull request #6269 from lioncash/file-shadow (diff) | |
| download | yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.tar.gz yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.tar.xz yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.zip | |
core: Resolve misc cases of variable shadowing
Resolves shadowing warnings that aren't in a particularly large
subsection of core. Brings us closer to turning -Wshadow into an error.
All that remains now is for cases in the kernel (left untouched for now
since a big change by bunnei is pending), and a few left over in the
service code (will be tackled next).
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 874b5673a..c2f0f609f 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -133,8 +133,8 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type, | |||
| 133 | } | 133 | } |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | void CoreTiming::AddTicks(u64 ticks) { | 136 | void CoreTiming::AddTicks(u64 ticks_to_add) { |
| 137 | this->ticks += ticks; | 137 | ticks += ticks_to_add; |
| 138 | downcount -= static_cast<s64>(ticks); | 138 | downcount -= static_cast<s64>(ticks); |
| 139 | } | 139 | } |
| 140 | 140 | ||