diff options
| author | 2019-02-13 21:42:04 -0500 | |
|---|---|---|
| committer | 2019-02-13 21:42:04 -0500 | |
| commit | 8490e7746a46df9c5feed50a2af342f0890270ff (patch) | |
| tree | e6d9ab7c228a4afed7612316f6e6e3bf52fb5f65 /src | |
| parent | Merge pull request #2116 from lioncash/size (diff) | |
| parent | core_timing: Make EmptyTimedCallback a local variable (diff) | |
| download | yuzu-8490e7746a46df9c5feed50a2af342f0890270ff.tar.gz yuzu-8490e7746a46df9c5feed50a2af342f0890270ff.tar.xz yuzu-8490e7746a46df9c5feed50a2af342f0890270ff.zip | |
Merge pull request #2115 from lioncash/local
core_timing: Make EmptyTimedCallback a local variable
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/core_timing.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 0308030c5..4ea00c277 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -70,8 +70,6 @@ static bool is_global_timer_sane; | |||
| 70 | 70 | ||
| 71 | static EventType* ev_lost = nullptr; | 71 | static EventType* ev_lost = nullptr; |
| 72 | 72 | ||
| 73 | static void EmptyTimedCallback(u64 userdata, s64 cyclesLate) {} | ||
| 74 | |||
| 75 | EventType* RegisterEvent(const std::string& name, TimedCallback callback) { | 73 | EventType* RegisterEvent(const std::string& name, TimedCallback callback) { |
| 76 | // check for existing type with same name. | 74 | // check for existing type with same name. |
| 77 | // we want event type names to remain unique so that we can use them for serialization. | 75 | // we want event type names to remain unique so that we can use them for serialization. |
| @@ -104,7 +102,9 @@ void Init() { | |||
| 104 | is_global_timer_sane = true; | 102 | is_global_timer_sane = true; |
| 105 | 103 | ||
| 106 | event_fifo_id = 0; | 104 | event_fifo_id = 0; |
| 107 | ev_lost = RegisterEvent("_lost_event", &EmptyTimedCallback); | 105 | |
| 106 | const auto empty_timed_callback = [](u64, s64) {}; | ||
| 107 | ev_lost = RegisterEvent("_lost_event", empty_timed_callback); | ||
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | void Shutdown() { | 110 | void Shutdown() { |