diff options
| author | bunnei <bunneidev@gmail.com> | 2019-02-13 21:42:04 -0500 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 21:42:04 -0500 | 
| commit | 8490e7746a46df9c5feed50a2af342f0890270ff (patch) | |
| tree | e6d9ab7c228a4afed7612316f6e6e3bf52fb5f65 | |
| parent | f0c4ac9abd75af3d3f1aebb6d60f8a27663a6a5c (diff) | |
| parent | 83ba3515ec73aa213b12411c6cae6b8e6ea77780 (diff) | |
Merge pull request #2115 from lioncash/local
core_timing: Make EmptyTimedCallback a local variable
| -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;  static EventType* ev_lost = nullptr; -static void EmptyTimedCallback(u64 userdata, s64 cyclesLate) {} -  EventType* RegisterEvent(const std::string& name, TimedCallback callback) {      // check for existing type with same name.      // we want event type names to remain unique so that we can use them for serialization. @@ -104,7 +102,9 @@ void Init() {      is_global_timer_sane = true;      event_fifo_id = 0; -    ev_lost = RegisterEvent("_lost_event", &EmptyTimedCallback); + +    const auto empty_timed_callback = [](u64, s64) {}; +    ev_lost = RegisterEvent("_lost_event", empty_timed_callback);  }  void Shutdown() { | 
