Browse Source
Merge pull request #9685 from liamwhite/minmax
kernel: unbreak min/max template deduction on Apple Clang
pull/15/merge
Mai
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
src/core/hle/kernel/k_page_table.cpp
|
|
|
@ -2144,8 +2144,8 @@ void KPageTable::RemapPageGroup(PageLinkedList* page_list, KProcessAddress addre |
|
|
|
const KMemoryInfo info = it->GetMemoryInfo(); |
|
|
|
|
|
|
|
// Determine the range to map.
|
|
|
|
KProcessAddress map_address = std::max(info.GetAddress(), start_address); |
|
|
|
const KProcessAddress map_end_address = std::min(info.GetEndAddress(), end_address); |
|
|
|
KProcessAddress map_address = std::max<VAddr>(info.GetAddress(), start_address); |
|
|
|
const KProcessAddress map_end_address = std::min<VAddr>(info.GetEndAddress(), end_address); |
|
|
|
ASSERT(map_end_address != map_address); |
|
|
|
|
|
|
|
// Determine if we should disable head merge.
|
|
|
|
|
