H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common: Rename NON_COPYABLE/NON_MOVABLE with YUZU_ prefix.

Browse Source
This commit is contained in:
bunnei 2021-05-01 12:22:14 -07:00
parent 0536004d91
commit d3c166d4d5
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/common_funcs.h
View File

@ -108,11 +108,11 @@ __declspec(dllimport) void __stdcall DebugBreak(void);
} \ } \
} }
#define NON_COPYABLE(cls) \ #define YUZU_NON_COPYABLE(cls) \
cls(const cls&) = delete; \ cls(const cls&) = delete; \
cls& operator=(const cls&) = delete cls& operator=(const cls&) = delete
#define NON_MOVEABLE(cls) \ #define YUZU_NON_MOVEABLE(cls) \
cls(cls&&) = delete; \ cls(cls&&) = delete; \
cls& operator=(cls&&) = delete cls& operator=(cls&&) = delete

6
src/core/hle/kernel/k_auto_object.h
View File

@ -18,8 +18,8 @@ class KernelCore;
class KProcess; class KProcess;
#define KERNEL_AUTOOBJECT_TRAITS(CLASS, BASE_CLASS) \ #define KERNEL_AUTOOBJECT_TRAITS(CLASS, BASE_CLASS) \
NON_COPYABLE(CLASS); \ YUZU_NON_COPYABLE(CLASS); \
NON_MOVEABLE(CLASS); \ YUZU_NON_MOVEABLE(CLASS); \
\ \
private: \ private: \
friend class ::Kernel::KClassTokenGenerator; \ friend class ::Kernel::KClassTokenGenerator; \
@ -213,7 +213,7 @@ public:
template <typename T> template <typename T>
class KScopedAutoObject { class KScopedAutoObject {
NON_COPYABLE(KScopedAutoObject); YUZU_NON_COPYABLE(KScopedAutoObject);
private: private:
template <typename U> template <typename U>

4
src/core/hle/kernel/k_auto_object_container.h
View File

@ -19,8 +19,8 @@ class KernelCore;
class KProcess; class KProcess;
class KAutoObjectWithListContainer { class KAutoObjectWithListContainer {
NON_COPYABLE(KAutoObjectWithListContainer); YUZU_NON_COPYABLE(KAutoObjectWithListContainer);
NON_MOVEABLE(KAutoObjectWithListContainer); YUZU_NON_MOVEABLE(KAutoObjectWithListContainer);
public: public:
using ListType = Common::IntrusiveRedBlackTreeMemberTraits< using ListType = Common::IntrusiveRedBlackTreeMemberTraits<

4
src/core/hle/kernel/k_handle_table.h
View File

@ -23,8 +23,8 @@ namespace Kernel {
class KernelCore; class KernelCore;
class KHandleTable { class KHandleTable {
NON_COPYABLE(KHandleTable); YUZU_NON_COPYABLE(KHandleTable);
NON_MOVEABLE(KHandleTable); YUZU_NON_MOVEABLE(KHandleTable);
public: public:
static constexpr size_t MaxTableSize = 1024; static constexpr size_t MaxTableSize = 1024;

4
src/core/hle/service/vi/display/vi_display.h
View File

@ -25,8 +25,8 @@ class Layer;
/// Represents a single display type /// Represents a single display type
class Display { class Display {
NON_COPYABLE(Display); YUZU_NON_COPYABLE(Display);
NON_MOVEABLE(Display); YUZU_NON_MOVEABLE(Display);
public: public:
/// Constructs a display with a given unique ID and name. /// Constructs a display with a given unique ID and name.