diff options
author | Liam <byteslice@airmail.cc> | 2023-03-07 05:08:53 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-03-13 03:06:53 +0100 |
commit | 57f1d8ef8d8de7d93e46f6ec26811cfe4879249b (patch) | |
tree | 4c7a0c362845ea182130b68920686ad3151088b2 /src/core/hle/kernel/slab_helpers.h | |
parent | kernel: conver KScopedLock, KScopedResourceReservation, KSessionRequest, KSharedMemory, KSpinLock (diff) | |
download | yuzu-57f1d8ef8d8de7d93e46f6ec26811cfe4879249b.tar yuzu-57f1d8ef8d8de7d93e46f6ec26811cfe4879249b.tar.gz yuzu-57f1d8ef8d8de7d93e46f6ec26811cfe4879249b.tar.bz2 yuzu-57f1d8ef8d8de7d93e46f6ec26811cfe4879249b.tar.lz yuzu-57f1d8ef8d8de7d93e46f6ec26811cfe4879249b.tar.xz yuzu-57f1d8ef8d8de7d93e46f6ec26811cfe4879249b.tar.zst yuzu-57f1d8ef8d8de7d93e46f6ec26811cfe4879249b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/slab_helpers.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/core/hle/kernel/slab_helpers.h b/src/core/hle/kernel/slab_helpers.h index 0228ce188..b9f5066de 100644 --- a/src/core/hle/kernel/slab_helpers.h +++ b/src/core/hle/kernel/slab_helpers.h @@ -132,7 +132,7 @@ protected: template <typename Derived, typename Base> class KAutoObjectWithSlabHeapAndContainer : public Base { - static_assert(std::is_base_of<KAutoObjectWithList, Base>::value); + static_assert(std::is_base_of_v<KAutoObjectWithList, Base>); private: static Derived* Allocate(KernelCore& kernel) { @@ -144,18 +144,18 @@ private: } public: - KAutoObjectWithSlabHeapAndContainer(KernelCore& kernel_) : Base(kernel_), kernel(kernel_) {} + KAutoObjectWithSlabHeapAndContainer(KernelCore& kernel_) : Base(kernel_) {} virtual ~KAutoObjectWithSlabHeapAndContainer() {} virtual void Destroy() override { const bool is_initialized = this->IsInitialized(); uintptr_t arg = 0; if (is_initialized) { - kernel.ObjectListContainer().Unregister(this); + Base::kernel.ObjectListContainer().Unregister(this); arg = this->GetPostDestroyArgument(); this->Finalize(); } - Free(kernel, static_cast<Derived*>(this)); + Free(Base::kernel, static_cast<Derived*>(this)); if (is_initialized) { Derived::PostDestroy(arg); } @@ -169,7 +169,7 @@ public: } size_t GetSlabIndex() const { - return SlabHeap<Derived>(kernel).GetObjectIndex(static_cast<const Derived*>(this)); + return SlabHeap<Derived>(Base::kernel).GetObjectIndex(static_cast<const Derived*>(this)); } public: @@ -209,9 +209,6 @@ public: static size_t GetNumRemaining(KernelCore& kernel) { return kernel.SlabHeap<Derived>().GetNumRemaining(); } - -protected: - KernelCore& kernel; }; } // namespace Kernel |