From 8ad41775ccae67e54e9f03cbe054d7562b1c66ce Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 29 Dec 2014 10:55:30 -0200 Subject: Kernel: Start using boost::intrusive_ptr for lifetime management --- src/core/hle/kernel/timer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/hle/kernel/timer.cpp') diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 685a202c..3b0452d4 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -66,7 +66,7 @@ ResultCode CreateTimer(Handle* handle, const ResetType reset_type, const std::st } ResultCode ClearTimer(Handle handle) { - Timer* timer = Kernel::g_handle_table.Get(handle); + SharedPtr timer = Kernel::g_handle_table.Get(handle); if (timer == nullptr) return InvalidHandle(ErrorModule::Kernel); @@ -80,7 +80,7 @@ static int TimerCallbackEventType = -1; /// The timer callback event, called when a timer is fired static void TimerCallback(u64 timer_handle, int cycles_late) { - Timer* timer = Kernel::g_handle_table.Get(timer_handle); + SharedPtr timer = Kernel::g_handle_table.Get(timer_handle); if (timer == nullptr) { LOG_CRITICAL(Kernel, "Callback fired for invalid timer %u", timer_handle); @@ -93,7 +93,7 @@ static void TimerCallback(u64 timer_handle, int cycles_late) { // Resume all waiting threads for (Handle thread_handle : timer->waiting_threads) { - if (Thread* thread = Kernel::g_handle_table.Get(thread_handle)) + if (SharedPtr thread = Kernel::g_handle_table.Get(thread_handle)) thread->ResumeFromWait(); } @@ -111,7 +111,7 @@ static void TimerCallback(u64 timer_handle, int cycles_late) { } ResultCode SetTimer(Handle handle, s64 initial, s64 interval) { - Timer* timer = Kernel::g_handle_table.Get(handle); + SharedPtr timer = Kernel::g_handle_table.Get(handle); if (timer == nullptr) return InvalidHandle(ErrorModule::Kernel); @@ -125,7 +125,7 @@ ResultCode SetTimer(Handle handle, s64 initial, s64 interval) { } ResultCode CancelTimer(Handle handle) { - Timer* timer = Kernel::g_handle_table.Get(handle); + SharedPtr timer = Kernel::g_handle_table.Get(handle); if (timer == nullptr) return InvalidHandle(ErrorModule::Kernel); -- cgit v1.2.3