1
0
Fork 0
forked from suyu/suyu

Merge pull request #2115 from lioncash/local

core_timing: Make EmptyTimedCallback a local variable
This commit is contained in:
bunnei 2019-02-13 21:42:04 -05:00 committed by GitHub
commit 8490e7746a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -70,8 +70,6 @@ static bool is_global_timer_sane;
static EventType* ev_lost = nullptr; static EventType* ev_lost = nullptr;
static void EmptyTimedCallback(u64 userdata, s64 cyclesLate) {}
EventType* RegisterEvent(const std::string& name, TimedCallback callback) { EventType* RegisterEvent(const std::string& name, TimedCallback callback) {
// check for existing type with same name. // check for existing type with same name.
// we want event type names to remain unique so that we can use them for serialization. // 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; is_global_timer_sane = true;
event_fifo_id = 0; 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() { void Shutdown() {