diff options
| author | 2021-05-01 12:22:14 -0700 | |
|---|---|---|
| committer | 2021-05-05 16:40:53 -0700 | |
| commit | d3c166d4d5fddb0c19c0219a3efdc85907ebce31 (patch) | |
| tree | d0df1f632cbf8dc884ef95393bcd6b6c6efa4926 /src/core/hle/kernel | |
| parent | fixup! hle: kernel: Rename Process to KProcess. (diff) | |
| download | yuzu-d3c166d4d5fddb0c19c0219a3efdc85907ebce31.tar.gz yuzu-d3c166d4d5fddb0c19c0219a3efdc85907ebce31.tar.xz yuzu-d3c166d4d5fddb0c19c0219a3efdc85907ebce31.zip | |
common: Rename NON_COPYABLE/NON_MOVABLE with YUZU_ prefix.
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/k_auto_object.h | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_auto_object_container.h | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_handle_table.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/kernel/k_auto_object.h b/src/core/hle/kernel/k_auto_object.h index 32aaf9fc5..e99986c68 100644 --- a/src/core/hle/kernel/k_auto_object.h +++ b/src/core/hle/kernel/k_auto_object.h | |||
| @@ -18,8 +18,8 @@ class KernelCore; | |||
| 18 | class KProcess; | 18 | class KProcess; |
| 19 | 19 | ||
| 20 | #define KERNEL_AUTOOBJECT_TRAITS(CLASS, BASE_CLASS) \ | 20 | #define KERNEL_AUTOOBJECT_TRAITS(CLASS, BASE_CLASS) \ |
| 21 | NON_COPYABLE(CLASS); \ | 21 | YUZU_NON_COPYABLE(CLASS); \ |
| 22 | NON_MOVEABLE(CLASS); \ | 22 | YUZU_NON_MOVEABLE(CLASS); \ |
| 23 | \ | 23 | \ |
| 24 | private: \ | 24 | private: \ |
| 25 | friend class ::Kernel::KClassTokenGenerator; \ | 25 | friend class ::Kernel::KClassTokenGenerator; \ |
| @@ -213,7 +213,7 @@ public: | |||
| 213 | 213 | ||
| 214 | template <typename T> | 214 | template <typename T> |
| 215 | class KScopedAutoObject { | 215 | class KScopedAutoObject { |
| 216 | NON_COPYABLE(KScopedAutoObject); | 216 | YUZU_NON_COPYABLE(KScopedAutoObject); |
| 217 | 217 | ||
| 218 | private: | 218 | private: |
| 219 | template <typename U> | 219 | template <typename U> |
diff --git a/src/core/hle/kernel/k_auto_object_container.h b/src/core/hle/kernel/k_auto_object_container.h index 6d1cd4862..8609f7a8d 100644 --- a/src/core/hle/kernel/k_auto_object_container.h +++ b/src/core/hle/kernel/k_auto_object_container.h | |||
| @@ -19,8 +19,8 @@ class KernelCore; | |||
| 19 | class KProcess; | 19 | class KProcess; |
| 20 | 20 | ||
| 21 | class KAutoObjectWithListContainer { | 21 | class KAutoObjectWithListContainer { |
| 22 | NON_COPYABLE(KAutoObjectWithListContainer); | 22 | YUZU_NON_COPYABLE(KAutoObjectWithListContainer); |
| 23 | NON_MOVEABLE(KAutoObjectWithListContainer); | 23 | YUZU_NON_MOVEABLE(KAutoObjectWithListContainer); |
| 24 | 24 | ||
| 25 | public: | 25 | public: |
| 26 | using ListType = Common::IntrusiveRedBlackTreeMemberTraits< | 26 | using ListType = Common::IntrusiveRedBlackTreeMemberTraits< |
diff --git a/src/core/hle/kernel/k_handle_table.h b/src/core/hle/kernel/k_handle_table.h index e38ad0fd9..74afb91b1 100644 --- a/src/core/hle/kernel/k_handle_table.h +++ b/src/core/hle/kernel/k_handle_table.h | |||
| @@ -23,8 +23,8 @@ namespace Kernel { | |||
| 23 | class KernelCore; | 23 | class KernelCore; |
| 24 | 24 | ||
| 25 | class KHandleTable { | 25 | class KHandleTable { |
| 26 | NON_COPYABLE(KHandleTable); | 26 | YUZU_NON_COPYABLE(KHandleTable); |
| 27 | NON_MOVEABLE(KHandleTable); | 27 | YUZU_NON_MOVEABLE(KHandleTable); |
| 28 | 28 | ||
| 29 | public: | 29 | public: |
| 30 | static constexpr size_t MaxTableSize = 1024; | 30 | static constexpr size_t MaxTableSize = 1024; |