diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/k_class_token.cpp | 79 |
1 files changed, 36 insertions, 43 deletions
diff --git a/src/core/hle/kernel/k_class_token.cpp b/src/core/hle/kernel/k_class_token.cpp index beb8a2a05..0be0027be 100644 --- a/src/core/hle/kernel/k_class_token.cpp +++ b/src/core/hle/kernel/k_class_token.cpp | |||
| @@ -84,50 +84,43 @@ static_assert(ClassToken<KTransferMemory> == ((0b10010001 << 8) | ClassToken<KAu | |||
| 84 | // Ensure that the token hierarchy reflects the class hierarchy. | 84 | // Ensure that the token hierarchy reflects the class hierarchy. |
| 85 | 85 | ||
| 86 | // Base classes. | 86 | // Base classes. |
| 87 | static_assert(!std::is_final<KSynchronizationObject>::value && | 87 | static_assert(!std::is_final_v<KSynchronizationObject> && |
| 88 | std::is_base_of<KAutoObject, KSynchronizationObject>::value); | 88 | std::is_base_of_v<KAutoObject, KSynchronizationObject>); |
| 89 | static_assert(!std::is_final<KReadableEvent>::value && | 89 | static_assert(!std::is_final_v<KReadableEvent> && |
| 90 | std::is_base_of<KSynchronizationObject, KReadableEvent>::value); | 90 | std::is_base_of_v<KSynchronizationObject, KReadableEvent>); |
| 91 | 91 | ||
| 92 | // Final classes | 92 | // Final classes |
| 93 | // static_assert(std::is_final<KInterruptEvent>::value && | 93 | // static_assert(std::is_final_v<KInterruptEvent> && |
| 94 | // std::is_base_of<KReadableEvent, KInterruptEvent>::value); | 94 | // std::is_base_of_v<KReadableEvent, KInterruptEvent>); |
| 95 | // static_assert(std::is_final<KDebug>::value && | 95 | // static_assert(std::is_final_v<KDebug> && |
| 96 | // std::is_base_of<KSynchronizationObject, KDebug>::value); | 96 | // std::is_base_of_v<KSynchronizationObject, KDebug>); |
| 97 | static_assert(std::is_final<KThread>::value && | 97 | static_assert(std::is_final_v<KThread> && std::is_base_of_v<KSynchronizationObject, KThread>); |
| 98 | std::is_base_of<KSynchronizationObject, KThread>::value); | 98 | static_assert(std::is_final_v<KServerPort> && |
| 99 | static_assert(std::is_final<KServerPort>::value && | 99 | std::is_base_of_v<KSynchronizationObject, KServerPort>); |
| 100 | std::is_base_of<KSynchronizationObject, KServerPort>::value); | 100 | static_assert(std::is_final_v<KServerSession> && |
| 101 | static_assert(std::is_final<KServerSession>::value && | 101 | std::is_base_of_v<KSynchronizationObject, KServerSession>); |
| 102 | std::is_base_of<KSynchronizationObject, KServerSession>::value); | 102 | static_assert(std::is_final_v<KClientPort> && |
| 103 | static_assert(std::is_final<KClientPort>::value && | 103 | std::is_base_of_v<KSynchronizationObject, KClientPort>); |
| 104 | std::is_base_of<KSynchronizationObject, KClientPort>::value); | 104 | static_assert(std::is_final_v<KClientSession> && std::is_base_of_v<KAutoObject, KClientSession>); |
| 105 | static_assert(std::is_final<KClientSession>::value && | 105 | static_assert(std::is_final_v<KProcess> && std::is_base_of_v<KSynchronizationObject, KProcess>); |
| 106 | std::is_base_of<KAutoObject, KClientSession>::value); | 106 | static_assert(std::is_final_v<KResourceLimit> && std::is_base_of_v<KAutoObject, KResourceLimit>); |
| 107 | static_assert(std::is_final<KProcess>::value && | 107 | // static_assert(std::is_final_v<KLightSession> && |
| 108 | std::is_base_of<KSynchronizationObject, KProcess>::value); | 108 | // std::is_base_of_v<KAutoObject, KLightSession>); |
| 109 | static_assert(std::is_final<KResourceLimit>::value && | 109 | static_assert(std::is_final_v<KPort> && std::is_base_of_v<KAutoObject, KPort>); |
| 110 | std::is_base_of<KAutoObject, KResourceLimit>::value); | 110 | static_assert(std::is_final_v<KSession> && std::is_base_of_v<KAutoObject, KSession>); |
| 111 | // static_assert(std::is_final<KLightSession>::value && | 111 | static_assert(std::is_final_v<KSharedMemory> && std::is_base_of_v<KAutoObject, KSharedMemory>); |
| 112 | // std::is_base_of<KAutoObject, KLightSession>::value); | 112 | static_assert(std::is_final_v<KEvent> && std::is_base_of_v<KAutoObject, KEvent>); |
| 113 | static_assert(std::is_final<KPort>::value && std::is_base_of<KAutoObject, KPort>::value); | 113 | static_assert(std::is_final_v<KWritableEvent> && std::is_base_of_v<KAutoObject, KWritableEvent>); |
| 114 | static_assert(std::is_final<KSession>::value && std::is_base_of<KAutoObject, KSession>::value); | 114 | // static_assert(std::is_final_v<KLightClientSession> && |
| 115 | static_assert(std::is_final<KSharedMemory>::value && | 115 | // std::is_base_of_v<KAutoObject, KLightClientSession>); |
| 116 | std::is_base_of<KAutoObject, KSharedMemory>::value); | 116 | // static_assert(std::is_final_v<KLightServerSession> && |
| 117 | static_assert(std::is_final<KEvent>::value && std::is_base_of<KAutoObject, KEvent>::value); | 117 | // std::is_base_of_v<KAutoObject, KLightServerSession>); |
| 118 | static_assert(std::is_final<KWritableEvent>::value && | 118 | static_assert(std::is_final_v<KTransferMemory> && std::is_base_of_v<KAutoObject, KTransferMemory>); |
| 119 | std::is_base_of<KAutoObject, KWritableEvent>::value); | 119 | // static_assert(std::is_final_v<KDeviceAddressSpace> && |
| 120 | // static_assert(std::is_final<KLightClientSession>::value && | 120 | // std::is_base_of_v<KAutoObject, KDeviceAddressSpace>); |
| 121 | // std::is_base_of<KAutoObject, KLightClientSession>::value); | 121 | // static_assert(std::is_final_v<KSessionRequest> && |
| 122 | // static_assert(std::is_final<KLightServerSession>::value && | 122 | // std::is_base_of_v<KAutoObject, KSessionRequest>); |
| 123 | // std::is_base_of<KAutoObject, KLightServerSession>::value); | 123 | // static_assert(std::is_final_v<KCodeMemory> && |
| 124 | static_assert(std::is_final<KTransferMemory>::value && | 124 | // std::is_base_of_v<KAutoObject, KCodeMemory>); |
| 125 | std::is_base_of<KAutoObject, KTransferMemory>::value); | ||
| 126 | // static_assert(std::is_final<KDeviceAddressSpace>::value && | ||
| 127 | // std::is_base_of<KAutoObject, KDeviceAddressSpace>::value); | ||
| 128 | // static_assert(std::is_final<KSessionRequest>::value && | ||
| 129 | // std::is_base_of<KAutoObject, KSessionRequest>::value); | ||
| 130 | // static_assert(std::is_final<KCodeMemory>::value && | ||
| 131 | // std::is_base_of<KAutoObject, KCodeMemory>::value); | ||
| 132 | 125 | ||
| 133 | } // namespace Kernel | 126 | } // namespace Kernel |