diff options
author | Lioncash <mathew1800@gmail.com> | 2018-10-10 06:42:10 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-10-10 08:04:55 +0200 |
commit | 5c0408596f6ccf5d2b171321bac386713b169d5b (patch) | |
tree | 1c5d3e1b178d7252cd3e752d8f2a99017a0ecb6d /src/core/hle/kernel/kernel.cpp | |
parent | Merge pull request #1461 from lioncash/warn (diff) | |
download | yuzu-5c0408596f6ccf5d2b171321bac386713b169d5b.tar yuzu-5c0408596f6ccf5d2b171321bac386713b169d5b.tar.gz yuzu-5c0408596f6ccf5d2b171321bac386713b169d5b.tar.bz2 yuzu-5c0408596f6ccf5d2b171321bac386713b169d5b.tar.lz yuzu-5c0408596f6ccf5d2b171321bac386713b169d5b.tar.xz yuzu-5c0408596f6ccf5d2b171321bac386713b169d5b.tar.zst yuzu-5c0408596f6ccf5d2b171321bac386713b169d5b.zip |
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 98eb74298..bd680adfe 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -116,7 +116,7 @@ struct KernelCore::Impl { next_thread_id = 1; process_list.clear(); - current_process.reset(); + current_process = nullptr; handle_table.Clear(); resource_limits.fill(nullptr); @@ -207,7 +207,7 @@ struct KernelCore::Impl { // Lists all processes that exist in the current session. std::vector<SharedPtr<Process>> process_list; - SharedPtr<Process> current_process; + Process* current_process = nullptr; Kernel::HandleTable handle_table; std::array<SharedPtr<ResourceLimit>, 4> resource_limits; @@ -266,15 +266,15 @@ void KernelCore::AppendNewProcess(SharedPtr<Process> process) { impl->process_list.push_back(std::move(process)); } -void KernelCore::MakeCurrentProcess(SharedPtr<Process> process) { - impl->current_process = std::move(process); +void KernelCore::MakeCurrentProcess(Process* process) { + impl->current_process = process; } -SharedPtr<Process>& KernelCore::CurrentProcess() { +Process* KernelCore::CurrentProcess() { return impl->current_process; } -const SharedPtr<Process>& KernelCore::CurrentProcess() const { +const Process* KernelCore::CurrentProcess() const { return impl->current_process; } |