diff options
| author | 2022-06-14 08:34:16 -0400 | |
|---|---|---|
| committer | 2022-06-14 08:34:16 -0400 | |
| commit | a3b12e3809e388e9c9b0608b14d85c0985e412c3 (patch) | |
| tree | 135226fe24596286c54bf9c5c4a12868c3c55e90 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #8459 from Morph1984/wextra-gcc (diff) | |
| parent | kernel: fix passthrough of local captures in lambda (diff) | |
| download | yuzu-a3b12e3809e388e9c9b0608b14d85c0985e412c3.tar.gz yuzu-a3b12e3809e388e9c9b0608b14d85c0985e412c3.tar.xz yuzu-a3b12e3809e388e9c9b0608b14d85c0985e412c3.zip | |
Merge pull request #8439 from liamwhite/monkey-compiler
general: fix compilation on GCC 12
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 7eb961912..b2c4f12b4 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -212,7 +212,9 @@ struct KernelCore::Impl { | |||
| 212 | system_resource_limit = KResourceLimit::Create(system.Kernel()); | 212 | system_resource_limit = KResourceLimit::Create(system.Kernel()); |
| 213 | system_resource_limit->Initialize(&core_timing); | 213 | system_resource_limit->Initialize(&core_timing); |
| 214 | 214 | ||
| 215 | const auto [total_size, kernel_size] = memory_layout->GetTotalAndKernelMemorySizes(); | 215 | const auto sizes{memory_layout->GetTotalAndKernelMemorySizes()}; |
| 216 | const auto total_size{sizes.first}; | ||
| 217 | const auto kernel_size{sizes.second}; | ||
| 216 | 218 | ||
| 217 | // If setting the default system values fails, then something seriously wrong has occurred. | 219 | // If setting the default system values fails, then something seriously wrong has occurred. |
| 218 | ASSERT(system_resource_limit->SetLimitValue(LimitableResource::PhysicalMemory, total_size) | 220 | ASSERT(system_resource_limit->SetLimitValue(LimitableResource::PhysicalMemory, total_size) |