From 670a5df7ceeb6a8ca6c350d51968e8cc0e8fc387 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 26 Mar 2026 19:29:25 -0500 Subject: [PATCH] CoreTiming: Change TimedCallback to a Common::MoveOnlyFunction. --- Source/Core/Core/CoreTiming.cpp | 2 +- Source/Core/Core/CoreTiming.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp index 9e45a7c387..18e86f11e0 100644 --- a/Source/Core/Core/CoreTiming.cpp +++ b/Source/Core/Core/CoreTiming.cpp @@ -70,7 +70,7 @@ EventType* CoreTimingManager::RegisterEvent(const std::string& name, TimedCallba "during Init to avoid breaking save states.", name); - auto info = m_event_types.emplace(name, EventType{callback, nullptr}); + auto info = m_event_types.emplace(name, EventType{std::move(callback), nullptr}); EventType* event_type = &info.first->second; event_type->name = &info.first->first; return event_type; diff --git a/Source/Core/Core/CoreTiming.h b/Source/Core/Core/CoreTiming.h index 68d1fd4fd2..29d636e433 100644 --- a/Source/Core/Core/CoreTiming.h +++ b/Source/Core/Core/CoreTiming.h @@ -23,6 +23,7 @@ #include #include "Common/CommonTypes.h" +#include "Common/Functional.h" #include "Common/HookableEvent.h" #include "Common/SPSCQueue.h" #include "Common/Timer.h" @@ -47,7 +48,8 @@ struct Globals float last_OC_factor_inverted = 0.0f; }; -typedef void (*TimedCallback)(Core::System& system, u64 userdata, s64 cyclesLate); +using TimedCallback = + Common::MoveOnlyFunction; struct EventType {