The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 15:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Modernize std::lower_bound/upper_bound with ranges and projections

Browse Source
This commit is contained in:
mitaclaw 2024-09-28 22:26:43 -07:00
parent 1c668350a0
commit 41c04ded93
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/MemArenaWin.cpp
View File

@ -220,9 +220,7 @@ WindowsMemoryRegion* MemArena::EnsureSplitRegionForMapping(void* start_address,
} }
// find closest region that is <= the given address by using upper bound and decrementing // find closest region that is <= the given address by using upper bound and decrementing
auto it = std::upper_bound( auto it = std::ranges::upper_bound(regions, address, {}, &WindowsMemoryRegion::m_start);
regions.begin(), regions.end(), address,
[](u8* addr, const WindowsMemoryRegion& region) { return addr < region.m_start; });
if (it == regions.begin()) if (it == regions.begin())
{ {
// this should never happen, implies that the given address is before the start of the // this should never happen, implies that the given address is before the start of the
@ -363,9 +361,7 @@ bool MemArena::JoinRegionsAfterUnmap(void* start_address, size_t size)
} }
// there should be a mapping that matches the request exactly, find it // there should be a mapping that matches the request exactly, find it
auto it = std::lower_bound( auto it = std::ranges::lower_bound(regions, address, {}, &WindowsMemoryRegion::m_start);
regions.begin(), regions.end(), address,
[](const WindowsMemoryRegion& region, u8* addr) { return region.m_start < addr; });
if (it == regions.end() || it->m_start != address || it->m_size != size) if (it == regions.end() || it->m_start != address || it->m_size != size)
{ {
// didn't find it, we were given bogus input // didn't find it, we were given bogus input