diff options
| author | Lioncash <mathew1800@gmail.com> | 2022-02-02 18:12:22 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2022-02-02 18:17:08 +0100 |
| commit | 76d83ffbece12d9509c5cc753dd6c69d8abeb458 (patch) | |
| tree | d514d72b25ccea9a7405bd36e8caf7a79da4d909 /src/core/hle/kernel | |
| parent | Merge pull request #7807 from german77/moar-buttons (diff) | |
| download | yuzu-76d83ffbece12d9509c5cc753dd6c69d8abeb458.tar yuzu-76d83ffbece12d9509c5cc753dd6c69d8abeb458.tar.gz yuzu-76d83ffbece12d9509c5cc753dd6c69d8abeb458.tar.bz2 yuzu-76d83ffbece12d9509c5cc753dd6c69d8abeb458.tar.lz yuzu-76d83ffbece12d9509c5cc753dd6c69d8abeb458.tar.xz yuzu-76d83ffbece12d9509c5cc753dd6c69d8abeb458.tar.zst yuzu-76d83ffbece12d9509c5cc753dd6c69d8abeb458.zip | |
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/k_auto_object.h | 7 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_auto_object_container.h | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_handle_table.h | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/core/hle/kernel/k_auto_object.h b/src/core/hle/kernel/k_auto_object.h index 165b76747..05779f2d5 100644 --- a/src/core/hle/kernel/k_auto_object.h +++ b/src/core/hle/kernel/k_auto_object.h @@ -20,8 +20,6 @@ class KernelCore; class KProcess; #define KERNEL_AUTOOBJECT_TRAITS(CLASS, BASE_CLASS) \ - YUZU_NON_COPYABLE(CLASS); \ - YUZU_NON_MOVEABLE(CLASS); \ \ private: \ friend class ::Kernel::KClassTokenGenerator; \ @@ -32,6 +30,9 @@ private: } \ \ public: \ + YUZU_NON_COPYABLE(CLASS); \ + YUZU_NON_MOVEABLE(CLASS); \ + \ using BaseClass = BASE_CLASS; \ static constexpr TypeObj GetStaticTypeObj() { \ constexpr ClassTokenType Token = ClassToken(); \ @@ -224,9 +225,9 @@ private: template <typename T> class KScopedAutoObject { +public: YUZU_NON_COPYABLE(KScopedAutoObject); -public: constexpr KScopedAutoObject() = default; constexpr KScopedAutoObject(T* o) : m_obj(o) { diff --git a/src/core/hle/kernel/k_auto_object_container.h b/src/core/hle/kernel/k_auto_object_container.h index 4eadfe99d..697cc4289 100644 --- a/src/core/hle/kernel/k_auto_object_container.h +++ b/src/core/hle/kernel/k_auto_object_container.h @@ -16,13 +16,12 @@ class KernelCore; class KProcess; class KAutoObjectWithListContainer { +public: YUZU_NON_COPYABLE(KAutoObjectWithListContainer); YUZU_NON_MOVEABLE(KAutoObjectWithListContainer); -public: using ListType = boost::intrusive::rbtree<KAutoObjectWithList>; -public: class ListAccessor : public KScopedLightLock { public: explicit ListAccessor(KAutoObjectWithListContainer* container) @@ -48,7 +47,6 @@ public: friend class ListAccessor; -public: KAutoObjectWithListContainer(KernelCore& kernel) : m_lock(kernel), m_object_list() {} void Initialize() {} diff --git a/src/core/hle/kernel/k_handle_table.h b/src/core/hle/kernel/k_handle_table.h index 4b114ec2f..87004a0f9 100644 --- a/src/core/hle/kernel/k_handle_table.h +++ b/src/core/hle/kernel/k_handle_table.h @@ -22,13 +22,12 @@ namespace Kernel { class KernelCore; class KHandleTable { +public: YUZU_NON_COPYABLE(KHandleTable); YUZU_NON_MOVEABLE(KHandleTable); -public: static constexpr size_t MaxTableSize = 1024; -public: explicit KHandleTable(KernelCore& kernel_); ~KHandleTable(); |