diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-02-02 16:04:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 16:04:26 -0500 |
| commit | d68eb751c53df785f842d56983ce4dfbb89aae3f (patch) | |
| tree | 510752a162e2bbb0e0f5a1e60b499aa4dca0493e /src/core/arm/arm_interface.h | |
| parent | 9484519ec368d74a87233e886d4266be2bd2d40e (diff) | |
| parent | ade44ac2ea66777e412644a273a43cbada55e6d6 (diff) | |
Merge pull request #7838 from lioncash/noncopy
common_types: Remove NonCopyable struct
Diffstat (limited to 'src/core/arm/arm_interface.h')
| -rw-r--r-- | src/core/arm/arm_interface.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 689e3ceb56..c603224425 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -6,6 +6,7 @@ #include <array> #include <vector> +#include "common/common_funcs.h" #include "common/common_types.h" #include "core/hardware_properties.h" @@ -24,8 +25,11 @@ class CPUInterruptHandler; using CPUInterrupts = std::array<CPUInterruptHandler, Core::Hardware::NUM_CPU_CORES>; /// Generic ARMv8 CPU interface -class ARM_Interface : NonCopyable { +class ARM_Interface { public: + YUZU_NON_COPYABLE(ARM_Interface); + YUZU_NON_MOVEABLE(ARM_Interface); + explicit ARM_Interface(System& system_, CPUInterrupts& interrupt_handlers_, bool uses_wall_clock_) : system{system_}, interrupt_handlers{interrupt_handlers_}, uses_wall_clock{ |