summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/memory/memory_block_manager.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-04-17 06:59:08 +0200
committerbunnei <bunneidev@gmail.com>2020-04-17 06:59:36 +0200
commit8bbe74a8dc62cd3933fd08237e707b0059fe8a78 (patch)
tree61b6af4968dcb52ba84aebdffd3cff0f3c5864ce /src/core/hle/kernel/memory/memory_block_manager.cpp
parentcore: device_memory: Remove incorrect usage of constexpr. (diff)
downloadyuzu-8bbe74a8dc62cd3933fd08237e707b0059fe8a78.tar
yuzu-8bbe74a8dc62cd3933fd08237e707b0059fe8a78.tar.gz
yuzu-8bbe74a8dc62cd3933fd08237e707b0059fe8a78.tar.bz2
yuzu-8bbe74a8dc62cd3933fd08237e707b0059fe8a78.tar.lz
yuzu-8bbe74a8dc62cd3933fd08237e707b0059fe8a78.tar.xz
yuzu-8bbe74a8dc62cd3933fd08237e707b0059fe8a78.tar.zst
yuzu-8bbe74a8dc62cd3933fd08237e707b0059fe8a78.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/memory/memory_block_manager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/memory/memory_block_manager.cpp b/src/core/hle/kernel/memory/memory_block_manager.cpp
index da009566f..1ebc126c0 100644
--- a/src/core/hle/kernel/memory/memory_block_manager.cpp
+++ b/src/core/hle/kernel/memory/memory_block_manager.cpp
@@ -15,7 +15,7 @@ MemoryBlockManager::MemoryBlockManager(VAddr start_addr, VAddr end_addr)
}
MemoryBlockManager::iterator MemoryBlockManager::FindIterator(VAddr addr) {
- iterator node{memory_block_tree.begin()};
+ auto node{memory_block_tree.begin()};
while (node != end()) {
const VAddr end_addr{node->GetNumPages() * PageSize + node->GetAddress()};
if (node->GetAddress() <= addr && end_addr - 1 >= addr) {
@@ -35,8 +35,8 @@ VAddr MemoryBlockManager::FindFreeArea(VAddr region_start, std::size_t region_nu
const VAddr region_end{region_start + region_num_pages * PageSize};
const VAddr region_last{region_end - 1};
- for (const_iterator it{FindIterator(region_start)}; it != memory_block_tree.cend(); it++) {
- const MemoryInfo info{it->GetMemoryInfo()};
+ for (auto it{FindIterator(region_start)}; it != memory_block_tree.cend(); it++) {
+ const auto info{it->GetMemoryInfo()};
if (region_last < info.GetAddress()) {
break;
}