diff options
| author | bunnei <bunneidev@gmail.com> | 2021-03-24 02:35:01 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2021-03-24 02:35:01 +0100 |
| commit | 9032d21365638aa6aaf4a2833b1149df6c838820 (patch) | |
| tree | 26f30f7a26df1f0ec6255ba526de1fd7cc199151 /src/core | |
| parent | hle: kernel: k_system_control: Remove unnecessary inline. (diff) | |
| download | yuzu-9032d21365638aa6aaf4a2833b1149df6c838820.tar yuzu-9032d21365638aa6aaf4a2833b1149df6c838820.tar.gz yuzu-9032d21365638aa6aaf4a2833b1149df6c838820.tar.bz2 yuzu-9032d21365638aa6aaf4a2833b1149df6c838820.tar.lz yuzu-9032d21365638aa6aaf4a2833b1149df6c838820.tar.xz yuzu-9032d21365638aa6aaf4a2833b1149df6c838820.tar.zst yuzu-9032d21365638aa6aaf4a2833b1149df6c838820.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/kernel/k_memory_layout.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_memory_layout.h b/src/core/hle/kernel/k_memory_layout.h index 590dc449a..288642d9a 100644 --- a/src/core/hle/kernel/k_memory_layout.h +++ b/src/core/hle/kernel/k_memory_layout.h @@ -4,6 +4,8 @@ #pragma once +#include <utility> + #include "common/alignment.h" #include "common/common_sizes.h" #include "common/common_types.h" @@ -208,7 +210,7 @@ public: static_cast<KMemoryRegionType>(KMemoryRegionAttr_LinearMapped)); } - std::tuple<size_t, size_t> GetTotalAndKernelMemorySizes() const { + std::pair<size_t, size_t> GetTotalAndKernelMemorySizes() const { size_t total_size = 0, kernel_size = 0; for (const auto& region : GetPhysicalMemoryRegionTree()) { if (region.IsDerivedFrom(KMemoryRegionType_Dram)) { @@ -218,7 +220,7 @@ public: } } } - return std::make_tuple(total_size, kernel_size); + return std::make_pair(total_size, kernel_size); } void InitializeLinearMemoryRegionTrees(PAddr aligned_linear_phys_start, |