diff options
| author |  liamwhite | 2023-11-14 12:23:28 -0500 |
|---|---|---|
| committer |  GitHub | 2023-11-14 12:23:28 -0500 |
| commit | a134e924ff5dcefa1e2d572040c5bc09c49d199c (patch) | |
| tree | 938ff43c3fccef82411115b15b142f6ab3f0aada | |
| parent | Merge pull request #12030 from t895/blocking-fix (diff) | |
| parent | fix apple clang build again (diff) | |
| download | yuzu-a134e924ff5dcefa1e2d572040c5bc09c49d199c.tar.gz yuzu-a134e924ff5dcefa1e2d572040c5bc09c49d199c.tar.xz yuzu-a134e924ff5dcefa1e2d572040c5bc09c49d199c.zip | |
Merge pull request #12032 from liamwhite/fruit-compiler
fix apple clang build again
| -rw-r--r-- | src/core/hle/kernel/k_page_table_base.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_page_table_base.cpp b/src/core/hle/kernel/k_page_table_base.cpp index 6a57ad55c..47dc8fd35 100644 --- a/src/core/hle/kernel/k_page_table_base.cpp +++ b/src/core/hle/kernel/k_page_table_base.cpp | |||
| @@ -1617,9 +1617,9 @@ void KPageTableBase::RemapPageGroup(PageLinkedList* page_list, KProcessAddress a | |||
| 1617 | const KMemoryInfo info = it->GetMemoryInfo(); | 1617 | const KMemoryInfo info = it->GetMemoryInfo(); |
| 1618 | 1618 | ||
| 1619 | // Determine the range to map. | 1619 | // Determine the range to map. |
| 1620 | KProcessAddress map_address = std::max(info.GetAddress(), GetInteger(start_address)); | 1620 | KProcessAddress map_address = std::max<u64>(info.GetAddress(), GetInteger(start_address)); |
| 1621 | const KProcessAddress map_end_address = | 1621 | const KProcessAddress map_end_address = |
| 1622 | std::min(info.GetEndAddress(), GetInteger(end_address)); | 1622 | std::min<u64>(info.GetEndAddress(), GetInteger(end_address)); |
| 1623 | ASSERT(map_end_address != map_address); | 1623 | ASSERT(map_end_address != map_address); |
| 1624 | 1624 | ||
| 1625 | // Determine if we should disable head merge. | 1625 | // Determine if we should disable head merge. |