diff options
| author | Mai <mai.iam2048@gmail.com> | 2023-01-27 00:07:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 00:07:50 +0000 |
| commit | 55da8e8ed8eea927169bfc69f652fbb6e4aa549d (patch) | |
| tree | 6b0fd0ba833601d405256c267ccea7bad46a22a9 /src | |
| parent | bfe5129779d81c34fe1e3a6cebf6db203b1b6ae2 (diff) | |
| parent | 86c6735bd0af434a4e46ea9de93d55122d54932a (diff) | |
Merge pull request #9685 from liamwhite/minmax
kernel: unbreak min/max template deduction on Apple Clang
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/k_page_table.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index fbd28f5f37..2e13d5d0df 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/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. |