diff options
author | Lioncash <mathew1800@gmail.com> | 2022-02-02 18:59:36 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2022-02-02 19:17:12 +0100 |
commit | f785f73e9279dcb9cfdee93da694d7a1f55142ea (patch) | |
tree | 52edfca975d8df963ef38987ea1e99b7fb6f5553 /src/core/hle/kernel/k_slab_heap.h | |
parent | general: Move deleted copy/move constructor/assignment operators to public interface (diff) | |
download | yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar.gz yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar.bz2 yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar.lz yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar.xz yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar.zst yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.zip |
Diffstat (limited to 'src/core/hle/kernel/k_slab_heap.h')
-rw-r--r-- | src/core/hle/kernel/k_slab_heap.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_slab_heap.h b/src/core/hle/kernel/k_slab_heap.h index 0ad74b0a0..05c0bec9c 100644 --- a/src/core/hle/kernel/k_slab_heap.h +++ b/src/core/hle/kernel/k_slab_heap.h @@ -7,6 +7,7 @@ #include <atomic> #include "common/assert.h" +#include "common/common_funcs.h" #include "common/common_types.h" namespace Kernel { @@ -15,13 +16,17 @@ class KernelCore; namespace impl { -class KSlabHeapImpl final : NonCopyable { +class KSlabHeapImpl final { public: + YUZU_NON_COPYABLE(KSlabHeapImpl); + YUZU_NON_MOVEABLE(KSlabHeapImpl); + struct Node { Node* next{}; }; constexpr KSlabHeapImpl() = default; + constexpr ~KSlabHeapImpl() = default; void Initialize(std::size_t size) { ASSERT(head == nullptr); @@ -64,9 +69,13 @@ private: } // namespace impl -class KSlabHeapBase : NonCopyable { +class KSlabHeapBase { public: + YUZU_NON_COPYABLE(KSlabHeapBase); + YUZU_NON_MOVEABLE(KSlabHeapBase); + constexpr KSlabHeapBase() = default; + constexpr ~KSlabHeapBase() = default; constexpr bool Contains(uintptr_t addr) const { return start <= addr && addr < end; |