diff options
| author | 2018-08-02 12:45:56 -0400 | |
|---|---|---|
| committer | 2018-08-02 12:46:15 -0400 | |
| commit | d94a173877325b722ba27640acc9adea249b7c1c (patch) | |
| tree | 077c3a08e14a1e044b0e84bcf95ab09cc89e50f1 /src/core/hle/kernel | |
| parent | kernel/vm_manager: Use const where applicable (diff) | |
| download | yuzu-d94a173877325b722ba27640acc9adea249b7c1c.tar.gz yuzu-d94a173877325b722ba27640acc9adea249b7c1c.tar.xz yuzu-d94a173877325b722ba27640acc9adea249b7c1c.zip | |
kernel/vm_manager: Convert loop into std::any_of()
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 0f89dd9f3..479cacb62 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <algorithm> | ||
| 5 | #include <iterator> | 6 | #include <iterator> |
| 6 | #include <utility> | 7 | #include <utility> |
| 7 | #include "common/assert.h" | 8 | #include "common/assert.h" |
| @@ -295,10 +296,9 @@ ResultVal<VMManager::VMAIter> VMManager::CarveVMARange(VAddr target, u64 size) { | |||
| 295 | 296 | ||
| 296 | VMAIter begin_vma = StripIterConstness(FindVMA(target)); | 297 | VMAIter begin_vma = StripIterConstness(FindVMA(target)); |
| 297 | const VMAIter i_end = vma_map.lower_bound(target_end); | 298 | const VMAIter i_end = vma_map.lower_bound(target_end); |
| 298 | for (auto i = begin_vma; i != i_end; ++i) { | 299 | if (std::any_of(begin_vma, i_end, |
| 299 | if (i->second.type == VMAType::Free) { | 300 | [](const auto& entry) { return entry.second.type == VMAType::Free; })) { |
| 300 | return ERR_INVALID_ADDRESS_STATE; | 301 | return ERR_INVALID_ADDRESS_STATE; |
| 301 | } | ||
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | if (target != begin_vma->second.base) { | 304 | if (target != begin_vma->second.base) { |