yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

hle: kernel: k_memory_layout: Use pair instead of tuple.

This commit is contained in:
bunnei 2021-03-23 18:35:01 -07:00
parent a32190d0c2
commit 9032d21365
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/kernel/k_memory_layout.h
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <utility>
#include "common/alignment.h" #include "common/alignment.h"
#include "common/common_sizes.h" #include "common/common_sizes.h"
#include "common/common_types.h" #include "common/common_types.h"
@ -208,7 +210,7 @@ public:
static_cast<KMemoryRegionType>(KMemoryRegionAttr_LinearMapped)); 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; size_t total_size = 0, kernel_size = 0;
for (const auto& region : GetPhysicalMemoryRegionTree()) { for (const auto& region : GetPhysicalMemoryRegionTree()) {
if (region.IsDerivedFrom(KMemoryRegionType_Dram)) { 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, void InitializeLinearMemoryRegionTrees(PAddr aligned_linear_phys_start,