From a5ab85ac37bbfed739e75ba9c2226b1e6bf1fd37 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 5 Mar 2021 17:08:17 -0800 Subject: Revert "core: Switch to unique_ptr for usage of Common::Fiber." --- src/core/hle/kernel/k_scheduler.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/hle/kernel/k_scheduler.h') diff --git a/src/core/hle/kernel/k_scheduler.h b/src/core/hle/kernel/k_scheduler.h index a4285c595..f595b9a5c 100644 --- a/src/core/hle/kernel/k_scheduler.h +++ b/src/core/hle/kernel/k_scheduler.h @@ -68,12 +68,12 @@ public: void OnThreadStart(); - [[nodiscard]] Common::Fiber* ControlContext() { - return switch_fiber.get(); + [[nodiscard]] std::shared_ptr& ControlContext() { + return switch_fiber; } - [[nodiscard]] const Common::Fiber* ControlContext() const { - return switch_fiber.get(); + [[nodiscard]] const std::shared_ptr& ControlContext() const { + return switch_fiber; } [[nodiscard]] u64 UpdateHighestPriorityThread(KThread* highest_thread); @@ -178,7 +178,7 @@ private: KThread* idle_thread; - std::unique_ptr switch_fiber{}; + std::shared_ptr switch_fiber{}; struct SchedulingState { std::atomic needs_scheduling; -- cgit v1.2.3