diff options
| author | 2018-10-10 10:34:20 -0400 | |
|---|---|---|
| committer | 2018-10-10 10:34:20 -0400 | |
| commit | 68b3d8b7a974780ff1eef3fe5764b2dd9cdb4d32 (patch) | |
| tree | 1c5d3e1b178d7252cd3e752d8f2a99017a0ecb6d /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #1461 from lioncash/warn (diff) | |
| parent | kernel/thread: Use a regular pointer for the owner/current process (diff) | |
| download | yuzu-68b3d8b7a974780ff1eef3fe5764b2dd9cdb4d32.tar.gz yuzu-68b3d8b7a974780ff1eef3fe5764b2dd9cdb4d32.tar.xz yuzu-68b3d8b7a974780ff1eef3fe5764b2dd9cdb4d32.zip | |
Merge pull request #1469 from lioncash/ptr
kernel/thread: Use a regular pointer for the owner/current process
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 { | |||
| 116 | next_thread_id = 1; | 116 | next_thread_id = 1; |
| 117 | 117 | ||
| 118 | process_list.clear(); | 118 | process_list.clear(); |
| 119 | current_process.reset(); | 119 | current_process = nullptr; |
| 120 | 120 | ||
| 121 | handle_table.Clear(); | 121 | handle_table.Clear(); |
| 122 | resource_limits.fill(nullptr); | 122 | resource_limits.fill(nullptr); |
| @@ -207,7 +207,7 @@ struct KernelCore::Impl { | |||
| 207 | 207 | ||
| 208 | // Lists all processes that exist in the current session. | 208 | // Lists all processes that exist in the current session. |
| 209 | std::vector<SharedPtr<Process>> process_list; | 209 | std::vector<SharedPtr<Process>> process_list; |
| 210 | SharedPtr<Process> current_process; | 210 | Process* current_process = nullptr; |
| 211 | 211 | ||
| 212 | Kernel::HandleTable handle_table; | 212 | Kernel::HandleTable handle_table; |
| 213 | std::array<SharedPtr<ResourceLimit>, 4> resource_limits; | 213 | std::array<SharedPtr<ResourceLimit>, 4> resource_limits; |
| @@ -266,15 +266,15 @@ void KernelCore::AppendNewProcess(SharedPtr<Process> process) { | |||
| 266 | impl->process_list.push_back(std::move(process)); | 266 | impl->process_list.push_back(std::move(process)); |
| 267 | } | 267 | } |
| 268 | 268 | ||
| 269 | void KernelCore::MakeCurrentProcess(SharedPtr<Process> process) { | 269 | void KernelCore::MakeCurrentProcess(Process* process) { |
| 270 | impl->current_process = std::move(process); | 270 | impl->current_process = process; |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | SharedPtr<Process>& KernelCore::CurrentProcess() { | 273 | Process* KernelCore::CurrentProcess() { |
| 274 | return impl->current_process; | 274 | return impl->current_process; |
| 275 | } | 275 | } |
| 276 | 276 | ||
| 277 | const SharedPtr<Process>& KernelCore::CurrentProcess() const { | 277 | const Process* KernelCore::CurrentProcess() const { |
| 278 | return impl->current_process; | 278 | return impl->current_process; |
| 279 | } | 279 | } |
| 280 | 280 | ||