Browse Source

Merge pull request #9685 from liamwhite/minmax

kernel: unbreak min/max template deduction on Apple Clang
nce_cpp
Mai 3 years ago
committed by GitHub
parent
commit
55da8e8ed8
  1. 4
      src/core/hle/kernel/k_page_table.cpp

4
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.

Loading…
Cancel
Save