diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-01 21:22:14 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2021-05-06 01:40:53 +0200 |
| commit | d3c166d4d5fddb0c19c0219a3efdc85907ebce31 (patch) | |
| tree | d0df1f632cbf8dc884ef95393bcd6b6c6efa4926 | |
| parent | fixup! hle: kernel: Rename Process to KProcess. (diff) | |
| download | yuzu-d3c166d4d5fddb0c19c0219a3efdc85907ebce31.tar yuzu-d3c166d4d5fddb0c19c0219a3efdc85907ebce31.tar.gz yuzu-d3c166d4d5fddb0c19c0219a3efdc85907ebce31.tar.bz2 yuzu-d3c166d4d5fddb0c19c0219a3efdc85907ebce31.tar.lz yuzu-d3c166d4d5fddb0c19c0219a3efdc85907ebce31.tar.xz yuzu-d3c166d4d5fddb0c19c0219a3efdc85907ebce31.tar.zst yuzu-d3c166d4d5fddb0c19c0219a3efdc85907ebce31.zip | |
| -rw-r--r-- | src/common/common_funcs.h | 4 | ||||
| -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 | ||||
| -rw-r--r-- | src/core/hle/service/vi/display/vi_display.h | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 19bb021e0..17d1ee86b 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -108,11 +108,11 @@ __declspec(dllimport) void __stdcall DebugBreak(void); } \ } -#define NON_COPYABLE(cls) \ +#define YUZU_NON_COPYABLE(cls) \ cls(const cls&) = delete; \ cls& operator=(const cls&) = delete -#define NON_MOVEABLE(cls) \ +#define YUZU_NON_MOVEABLE(cls) \ cls(cls&&) = delete; \ cls& operator=(cls&&) = delete 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; class KProcess; #define KERNEL_AUTOOBJECT_TRAITS(CLASS, BASE_CLASS) \ - NON_COPYABLE(CLASS); \ - NON_MOVEABLE(CLASS); \ + YUZU_NON_COPYABLE(CLASS); \ + YUZU_NON_MOVEABLE(CLASS); \ \ private: \ friend class ::Kernel::KClassTokenGenerator; \ @@ -213,7 +213,7 @@ public: template <typename T> class KScopedAutoObject { - NON_COPYABLE(KScopedAutoObject); + YUZU_NON_COPYABLE(KScopedAutoObject); private: 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; class KProcess; class KAutoObjectWithListContainer { - NON_COPYABLE(KAutoObjectWithListContainer); - NON_MOVEABLE(KAutoObjectWithListContainer); + YUZU_NON_COPYABLE(KAutoObjectWithListContainer); + YUZU_NON_MOVEABLE(KAutoObjectWithListContainer); public: 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 { class KernelCore; class KHandleTable { - NON_COPYABLE(KHandleTable); - NON_MOVEABLE(KHandleTable); + YUZU_NON_COPYABLE(KHandleTable); + YUZU_NON_MOVEABLE(KHandleTable); public: static constexpr size_t MaxTableSize = 1024; diff --git a/src/core/hle/service/vi/display/vi_display.h b/src/core/hle/service/vi/display/vi_display.h index a09d982bc..388ce6083 100644 --- a/src/core/hle/service/vi/display/vi_display.h +++ b/src/core/hle/service/vi/display/vi_display.h @@ -25,8 +25,8 @@ class Layer; /// Represents a single display type class Display { - NON_COPYABLE(Display); - NON_MOVEABLE(Display); + YUZU_NON_COPYABLE(Display); + YUZU_NON_MOVEABLE(Display); public: /// Constructs a display with a given unique ID and name. |