diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-11-05 13:25:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-05 13:25:29 -0400 |
| commit | 4c198bbf06fe7b72d4718cf3571e99b6169e9f47 (patch) | |
| tree | 3f091be57ce7198ee53b721b160a454ef6dee913 /src/core/hle/kernel/k_class_token.h | |
| parent | 8baf036cdc1c7b8bc1e6692b4e896cf4cbc6ae6d (diff) | |
| parent | cf0f821565570314c7a47ba332774f4d4c0fff71 (diff) | |
Merge pull request #9173 from bunnei/kern-update-15
Kernel: Various updates for FW 15.0.x
Diffstat (limited to 'src/core/hle/kernel/k_class_token.h')
| -rw-r--r-- | src/core/hle/kernel/k_class_token.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/hle/kernel/k_class_token.h b/src/core/hle/kernel/k_class_token.h index ab20e00ff..e75b1c035 100644 --- a/src/core/hle/kernel/k_class_token.h +++ b/src/core/hle/kernel/k_class_token.h @@ -10,6 +10,8 @@ namespace Kernel { class KAutoObject; +class KSystemResource; + class KClassTokenGenerator { public: using TokenBaseType = u16; @@ -58,7 +60,7 @@ private: if constexpr (std::is_same<T, KAutoObject>::value) { static_assert(T::ObjectType == ObjectType::KAutoObject); return 0; - } else if constexpr (!std::is_final<T>::value) { + } else if constexpr (!std::is_final<T>::value && !std::same_as<T, KSystemResource>) { static_assert(ObjectType::BaseClassesStart <= T::ObjectType && T::ObjectType < ObjectType::BaseClassesEnd); constexpr auto ClassIndex = static_cast<TokenBaseType>(T::ObjectType) - @@ -108,6 +110,8 @@ public: KSessionRequest, KCodeMemory, + KSystemResource, + // NOTE: True order for these has not been determined yet. KAlpha, KBeta, |