diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/k_class_token.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_handle_table.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_class_token.cpp b/src/core/hle/kernel/k_class_token.cpp index 6eb44d6a6..a850db3c4 100644 --- a/src/core/hle/kernel/k_class_token.cpp +++ b/src/core/hle/kernel/k_class_token.cpp | |||
| @@ -120,6 +120,6 @@ static_assert(std::is_final_v<KTransferMemory> && std::is_base_of_v<KAutoObject, | |||
| 120 | // static_assert(std::is_final_v<KCodeMemory> && | 120 | // static_assert(std::is_final_v<KCodeMemory> && |
| 121 | // std::is_base_of_v<KAutoObject, KCodeMemory>); | 121 | // std::is_base_of_v<KAutoObject, KCodeMemory>); |
| 122 | 122 | ||
| 123 | static_assert(std::is_base_of<KAutoObject, KSystemResource>::value); | 123 | static_assert(std::is_base_of_v<KAutoObject, KSystemResource>); |
| 124 | 124 | ||
| 125 | } // namespace Kernel | 125 | } // namespace Kernel |
diff --git a/src/core/hle/kernel/k_handle_table.h b/src/core/hle/kernel/k_handle_table.h index e98a01c86..65cae3b27 100644 --- a/src/core/hle/kernel/k_handle_table.h +++ b/src/core/hle/kernel/k_handle_table.h | |||
| @@ -74,7 +74,7 @@ public: | |||
| 74 | KScopedDisableDispatch dd{m_kernel}; | 74 | KScopedDisableDispatch dd{m_kernel}; |
| 75 | KScopedSpinLock lk(m_lock); | 75 | KScopedSpinLock lk(m_lock); |
| 76 | 76 | ||
| 77 | if constexpr (std::is_same<T, KAutoObject>::value) { | 77 | if constexpr (std::is_same_v<T, KAutoObject>) { |
| 78 | return this->GetObjectImpl(handle); | 78 | return this->GetObjectImpl(handle); |
| 79 | } else { | 79 | } else { |
| 80 | if (auto* obj = this->GetObjectImpl(handle); obj != nullptr) [[likely]] { | 80 | if (auto* obj = this->GetObjectImpl(handle); obj != nullptr) [[likely]] { |