From d57b12193b12f7b6e3565d29f7bc3d7584632768 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 4 May 2021 22:14:06 -0700 Subject: hle: kernel: KPageTable: CanContain should not be constexpr. --- src/core/hle/kernel/k_page_table.cpp | 2 +- src/core/hle/kernel/k_page_table.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/hle') diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index 6c5d7d602..d4ce98ee3 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -1106,7 +1106,7 @@ constexpr std::size_t KPageTable::GetRegionSize(KMemoryState state) const { } } -constexpr bool KPageTable::CanContain(VAddr addr, std::size_t size, KMemoryState state) const { +bool KPageTable::CanContain(VAddr addr, std::size_t size, KMemoryState state) const { const VAddr end{addr + size}; const VAddr last{end - 1}; const VAddr region_start{GetRegionAddress(state)}; diff --git a/src/core/hle/kernel/k_page_table.h b/src/core/hle/kernel/k_page_table.h index baec7c260..8c2cc03eb 100644 --- a/src/core/hle/kernel/k_page_table.h +++ b/src/core/hle/kernel/k_page_table.h @@ -64,7 +64,7 @@ public: return page_table_impl; } - constexpr bool CanContain(VAddr addr, std::size_t size, KMemoryState state) const; + bool CanContain(VAddr addr, std::size_t size, KMemoryState state) const; private: enum class OperationType : u32 { -- cgit v1.2.3