summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-05-03 19:34:21 +0200
committerLioncash <mathew1800@gmail.com>2020-05-03 19:34:24 +0200
commit26aee55aef18acddf2b922191cc1f5bbb7724c03 (patch)
tree78fbd9efa5d6f26791984feaf1f483e8d009848b /src/core/hle/kernel
parentkernel/memory: Resolve -Wshadow warnings (diff)
downloadyuzu-26aee55aef18acddf2b922191cc1f5bbb7724c03.tar
yuzu-26aee55aef18acddf2b922191cc1f5bbb7724c03.tar.gz
yuzu-26aee55aef18acddf2b922191cc1f5bbb7724c03.tar.bz2
yuzu-26aee55aef18acddf2b922191cc1f5bbb7724c03.tar.lz
yuzu-26aee55aef18acddf2b922191cc1f5bbb7724c03.tar.xz
yuzu-26aee55aef18acddf2b922191cc1f5bbb7724c03.tar.zst
yuzu-26aee55aef18acddf2b922191cc1f5bbb7724c03.zip
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/memory/address_space_info.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/memory/address_space_info.cpp b/src/core/hle/kernel/memory/address_space_info.cpp
index 27fae05e7..ca226e885 100644
--- a/src/core/hle/kernel/memory/address_space_info.cpp
+++ b/src/core/hle/kernel/memory/address_space_info.cpp
@@ -49,18 +49,18 @@ constexpr bool IsAllowedIndexForAddress(std::size_t index) {
return index < std::size(AddressSpaceInfos) && AddressSpaceInfos[index].GetAddress() != Invalid;
}
-constexpr std::size_t
- AddressSpaceIndices32Bit[static_cast<std::size_t>(AddressSpaceInfo::Type::Count)]{
+constexpr std::array<std::size_t, static_cast<std::size_t>(AddressSpaceInfo::Type::Count)>
+ AddressSpaceIndices32Bit{
0, 1, 0, 2, 0, 3,
};
-constexpr std::size_t
- AddressSpaceIndices36Bit[static_cast<std::size_t>(AddressSpaceInfo::Type::Count)]{
+constexpr std::array<std::size_t, static_cast<std::size_t>(AddressSpaceInfo::Type::Count)>
+ AddressSpaceIndices36Bit{
4, 5, 4, 6, 4, 7,
};
-constexpr std::size_t
- AddressSpaceIndices39Bit[static_cast<std::size_t>(AddressSpaceInfo::Type::Count)]{
+constexpr std::array<std::size_t, static_cast<std::size_t>(AddressSpaceInfo::Type::Count)>
+ AddressSpaceIndices39Bit{
9, 8, 8, 10, 12, 11,
};