diff options
| author | 2018-09-15 15:21:06 +0200 | |
|---|---|---|
| committer | 2018-09-15 15:21:06 +0200 | |
| commit | 63c2e32e207d31ecadd9022e1d7cd705c9febac8 (patch) | |
| tree | 8a90e8ef2804f147dff7225a543a8740ecf7160c /src/core/core_cpu.cpp | |
| parent | Merge pull request #1310 from lioncash/kernel-ns (diff) | |
| download | yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.tar.gz yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.tar.xz yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.zip | |
Port #4182 from Citra: "Prefix all size_t with std::"
Diffstat (limited to 'src/core/core_cpu.cpp')
| -rw-r--r-- | src/core/core_cpu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp index b042ee02b..15d60cc8a 100644 --- a/src/core/core_cpu.cpp +++ b/src/core/core_cpu.cpp | |||
| @@ -49,7 +49,7 @@ bool CpuBarrier::Rendezvous() { | |||
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | Cpu::Cpu(std::shared_ptr<ExclusiveMonitor> exclusive_monitor, | 51 | Cpu::Cpu(std::shared_ptr<ExclusiveMonitor> exclusive_monitor, |
| 52 | std::shared_ptr<CpuBarrier> cpu_barrier, size_t core_index) | 52 | std::shared_ptr<CpuBarrier> cpu_barrier, std::size_t core_index) |
| 53 | : cpu_barrier{std::move(cpu_barrier)}, core_index{core_index} { | 53 | : cpu_barrier{std::move(cpu_barrier)}, core_index{core_index} { |
| 54 | 54 | ||
| 55 | if (Settings::values.use_cpu_jit) { | 55 | if (Settings::values.use_cpu_jit) { |
| @@ -66,7 +66,7 @@ Cpu::Cpu(std::shared_ptr<ExclusiveMonitor> exclusive_monitor, | |||
| 66 | scheduler = std::make_shared<Kernel::Scheduler>(arm_interface.get()); | 66 | scheduler = std::make_shared<Kernel::Scheduler>(arm_interface.get()); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | std::shared_ptr<ExclusiveMonitor> Cpu::MakeExclusiveMonitor(size_t num_cores) { | 69 | std::shared_ptr<ExclusiveMonitor> Cpu::MakeExclusiveMonitor(std::size_t num_cores) { |
| 70 | if (Settings::values.use_cpu_jit) { | 70 | if (Settings::values.use_cpu_jit) { |
| 71 | #ifdef ARCHITECTURE_x86_64 | 71 | #ifdef ARCHITECTURE_x86_64 |
| 72 | return std::make_shared<DynarmicExclusiveMonitor>(num_cores); | 72 | return std::make_shared<DynarmicExclusiveMonitor>(num_cores); |