OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-22 13:20:04 +00:00
Code Issues Projects Releases Wiki Activity

kernel/vm_manager: Convert loop into std::any_of()

Browse Source
This commit is contained in:
Lioncash 2018-08-02 12:45:56 -04:00 committed by fearlessTobi
parent c7e1dab45b
commit 469ed4a09f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/kernel/vm_manager.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <iterator> #include <iterator>
#include "common/assert.h" #include "common/assert.h"
#include "core/hle/kernel/errors.h" #include "core/hle/kernel/errors.h"
@ -322,11 +323,10 @@ ResultVal<VMManager::VMAIter> VMManager::CarveVMARange(VAddr target, u32 size) {
VMAIter begin_vma = StripIterConstness(FindVMA(target)); VMAIter begin_vma = StripIterConstness(FindVMA(target));
const VMAIter i_end = vma_map.lower_bound(target_end); const VMAIter i_end = vma_map.lower_bound(target_end);
for (auto i = begin_vma; i != i_end; ++i) { if (std::any_of(begin_vma, i_end,
if (i->second.type == VMAType::Free) { [](const auto& entry) { return entry.second.type == VMAType::Free; })) {
return ERR_INVALID_ADDRESS_STATE; return ERR_INVALID_ADDRESS_STATE;
} }
}
if (target != begin_vma->second.base) { if (target != begin_vma->second.base) {
begin_vma = SplitVMA(begin_vma, target - begin_vma->second.base); begin_vma = SplitVMA(begin_vma, target - begin_vma->second.base);