summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-05-03 13:29:06 -0400
committerLioncash <mathew1800@gmail.com>2020-05-03 13:29:42 -0400
commitdfa582169bfeec61f0e4c01545a7e3c290210d0d (patch)
tree6cf19daa9407ac65f22a4a2e6ca3725776047fe2 /src
parent3cfa7a89e009026f33a0353d8c61deb555a904e4 (diff)
kernel/memory: Resolve -Wshadow warnings
Prevents variable name clashing.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/memory/memory_manager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/memory/memory_manager.cpp b/src/core/hle/kernel/memory/memory_manager.cpp
index 3cd4f9e85..6b432e1b2 100644
--- a/src/core/hle/kernel/memory/memory_manager.cpp
+++ b/src/core/hle/kernel/memory/memory_manager.cpp
@@ -104,9 +104,9 @@ ResultCode MemoryManager::Allocate(PageLinkedList& page_list, std::size_t num_pa
// Ensure that we don't leave anything un-freed
auto group_guard = detail::ScopeExit([&] {
for (const auto& it : page_list.Nodes()) {
- const auto num_pages{std::min(
+ const auto min_num_pages{std::min(
it.GetNumPages(), (chosen_manager.GetEndAddress() - it.GetAddress()) / PageSize)};
- chosen_manager.Free(it.GetAddress(), num_pages);
+ chosen_manager.Free(it.GetAddress(), min_num_pages);
}
});
@@ -165,9 +165,9 @@ ResultCode MemoryManager::Free(PageLinkedList& page_list, std::size_t num_pages,
// Free all of the pages
for (const auto& it : page_list.Nodes()) {
- const auto num_pages{std::min(
+ const auto min_num_pages{std::min(
it.GetNumPages(), (chosen_manager.GetEndAddress() - it.GetAddress()) / PageSize)};
- chosen_manager.Free(it.GetAddress(), num_pages);
+ chosen_manager.Free(it.GetAddress(), min_num_pages);
}
return RESULT_SUCCESS;