diff options
| author | 2020-01-30 23:33:02 -0500 | |
|---|---|---|
| committer | 2020-01-30 23:33:02 -0500 | |
| commit | 6b5b01b29f51cf74c0735867f800afb9672729d9 (patch) | |
| tree | 21f251c154835bc82f24a9b82a048f45e0495a7b /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #3365 from yuzu-emu/revert-3151-fix-korean (diff) | |
| parent | kernel/physical_core: Make use of std::unique_ptr (diff) | |
| download | yuzu-6b5b01b29f51cf74c0735867f800afb9672729d9.tar.gz yuzu-6b5b01b29f51cf74c0735867f800afb9672729d9.tar.xz yuzu-6b5b01b29f51cf74c0735867f800afb9672729d9.zip | |
Merge pull request #3363 from lioncash/unique_ptr
kernel/physical_core: Make use of std::unique_ptr instead of std::shared_ptr
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 0cf3c8f70..edd4c4259 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -101,7 +101,7 @@ struct KernelCore::Impl { | |||
| 101 | void Initialize(KernelCore& kernel) { | 101 | void Initialize(KernelCore& kernel) { |
| 102 | Shutdown(); | 102 | Shutdown(); |
| 103 | 103 | ||
| 104 | InitializePhysicalCores(kernel); | 104 | InitializePhysicalCores(); |
| 105 | InitializeSystemResourceLimit(kernel); | 105 | InitializeSystemResourceLimit(kernel); |
| 106 | InitializeThreads(); | 106 | InitializeThreads(); |
| 107 | InitializePreemption(); | 107 | InitializePreemption(); |
| @@ -131,14 +131,14 @@ struct KernelCore::Impl { | |||
| 131 | } | 131 | } |
| 132 | cores.clear(); | 132 | cores.clear(); |
| 133 | 133 | ||
| 134 | exclusive_monitor.reset(nullptr); | 134 | exclusive_monitor.reset(); |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | void InitializePhysicalCores(KernelCore& kernel) { | 137 | void InitializePhysicalCores() { |
| 138 | exclusive_monitor = | 138 | exclusive_monitor = |
| 139 | Core::MakeExclusiveMonitor(system.Memory(), global_scheduler.CpuCoresCount()); | 139 | Core::MakeExclusiveMonitor(system.Memory(), global_scheduler.CpuCoresCount()); |
| 140 | for (std::size_t i = 0; i < global_scheduler.CpuCoresCount(); i++) { | 140 | for (std::size_t i = 0; i < global_scheduler.CpuCoresCount(); i++) { |
| 141 | cores.emplace_back(system, kernel, i, *exclusive_monitor); | 141 | cores.emplace_back(system, i, *exclusive_monitor); |
| 142 | } | 142 | } |
| 143 | } | 143 | } |
| 144 | 144 | ||