diff options
| author | bunnei <bunneidev@gmail.com> | 2021-03-05 17:08:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 17:08:48 -0800 |
| commit | 7b29a8ce4e1f94bec7e7828fb1674e1b43b937c5 (patch) | |
| tree | 503cbe4fb52939512f8ee0c976e46e9293de3c4c /src/core/hle/kernel/k_thread.h | |
| parent | 9d010be4837cc88e28c700f640c1c101092d482a (diff) | |
| parent | a5ab85ac37bbfed739e75ba9c2226b1e6bf1fd37 (diff) | |
Merge pull request #6039 from yuzu-emu/revert-6006-fiber-unique-ptr
Revert "core: Switch to unique_ptr for usage of Common::Fiber."
Diffstat (limited to 'src/core/hle/kernel/k_thread.h')
| -rw-r--r-- | src/core/hle/kernel/k_thread.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index a2893d939..c8ac656a4 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -293,13 +293,7 @@ public: return thread_context_64; } - [[nodiscard]] Common::Fiber* GetHostContext() { - return host_context.get(); - } - - [[nodiscard]] const Common::Fiber* GetHostContext() const { - return host_context.get(); - } + [[nodiscard]] std::shared_ptr<Common::Fiber>& GetHostContext(); [[nodiscard]] ThreadState GetState() const { return thread_state & ThreadState::Mask; @@ -725,7 +719,7 @@ private: Common::SpinLock context_guard{}; // For emulation - std::unique_ptr<Common::Fiber> host_context{}; + std::shared_ptr<Common::Fiber> host_context{}; // For debugging std::vector<KSynchronizationObject*> wait_objects_for_debugging; |
