summaryrefslogtreecommitdiff
path: root/src/core/core_timing.h
diff options
context:
space:
mode:
authorGravatar bunnei2021-05-03 16:04:28 -0700
committerGravatar GitHub2021-05-03 16:04:28 -0700
commitdf51eb9bdec5be189e0662ab81bc29277f3da343 (patch)
treedc1a5cf937fe77ccabb8dab97b5e9a5af9758c27 /src/core/core_timing.h
parentMerge pull request #6275 from german77/mousefocus (diff)
parentcore: Resolve misc cases of variable shadowing (diff)
downloadyuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.gz
yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.xz
yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.zip
Merge pull request #6278 from lioncash/misc-shadow
core: Resolve misc straggler cases of variable shadowing
Diffstat (limited to 'src/core/core_timing.h')
-rw-r--r--src/core/core_timing.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index 77ff4c6fe..b64caacda 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -102,7 +102,7 @@ public:
102 /// We only permit one event of each type in the queue at a time. 102 /// We only permit one event of each type in the queue at a time.
103 void RemoveEvent(const std::shared_ptr<EventType>& event_type); 103 void RemoveEvent(const std::shared_ptr<EventType>& event_type);
104 104
105 void AddTicks(u64 ticks); 105 void AddTicks(u64 ticks_to_add);
106 106
107 void ResetTicks(); 107 void ResetTicks();
108 108