diff options
| author | 2021-03-23 18:35:01 -0700 | |
|---|---|---|
| committer | 2021-03-23 18:35:01 -0700 | |
| commit | 9032d21365638aa6aaf4a2833b1149df6c838820 (patch) | |
| tree | 26f30f7a26df1f0ec6255ba526de1fd7cc199151 /src | |
| parent | hle: kernel: k_system_control: Remove unnecessary inline. (diff) | |
| download | yuzu-9032d21365638aa6aaf4a2833b1149df6c838820.tar.gz yuzu-9032d21365638aa6aaf4a2833b1149df6c838820.tar.xz yuzu-9032d21365638aa6aaf4a2833b1149df6c838820.zip | |
hle: kernel: k_memory_layout: Use pair instead of tuple.
Diffstat (limited to 'src')
| -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 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <utility> | ||
| 8 | |||
| 7 | #include "common/alignment.h" | 9 | #include "common/alignment.h" |
| 8 | #include "common/common_sizes.h" | 10 | #include "common/common_sizes.h" |
| 9 | #include "common/common_types.h" | 11 | #include "common/common_types.h" |
| @@ -208,7 +210,7 @@ public: | |||
| 208 | static_cast<KMemoryRegionType>(KMemoryRegionAttr_LinearMapped)); | 210 | static_cast<KMemoryRegionType>(KMemoryRegionAttr_LinearMapped)); |
| 209 | } | 211 | } |
| 210 | 212 | ||
| 211 | std::tuple<size_t, size_t> GetTotalAndKernelMemorySizes() const { | 213 | std::pair<size_t, size_t> GetTotalAndKernelMemorySizes() const { |
| 212 | size_t total_size = 0, kernel_size = 0; | 214 | size_t total_size = 0, kernel_size = 0; |
| 213 | for (const auto& region : GetPhysicalMemoryRegionTree()) { | 215 | for (const auto& region : GetPhysicalMemoryRegionTree()) { |
| 214 | if (region.IsDerivedFrom(KMemoryRegionType_Dram)) { | 216 | if (region.IsDerivedFrom(KMemoryRegionType_Dram)) { |
| @@ -218,7 +220,7 @@ public: | |||
| 218 | } | 220 | } |
| 219 | } | 221 | } |
| 220 | } | 222 | } |
| 221 | return std::make_tuple(total_size, kernel_size); | 223 | return std::make_pair(total_size, kernel_size); |
| 222 | } | 224 | } |
| 223 | 225 | ||
| 224 | void InitializeLinearMemoryRegionTrees(PAddr aligned_linear_phys_start, | 226 | void InitializeLinearMemoryRegionTrees(PAddr aligned_linear_phys_start, |