diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-28 00:29:51 +0200 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-28 00:29:51 +0200 |
| commit | a48c6b947d5314ab804f375cca22af159cc3b77b (patch) | |
| tree | 5f49ac6edc39d37c9b49514217957b47e73505f2 /src/core/arm | |
| parent | fixed weird spacing (diff) | |
| download | yuzu-a48c6b947d5314ab804f375cca22af159cc3b77b.tar yuzu-a48c6b947d5314ab804f375cca22af159cc3b77b.tar.gz yuzu-a48c6b947d5314ab804f375cca22af159cc3b77b.tar.bz2 yuzu-a48c6b947d5314ab804f375cca22af159cc3b77b.tar.lz yuzu-a48c6b947d5314ab804f375cca22af159cc3b77b.tar.xz yuzu-a48c6b947d5314ab804f375cca22af159cc3b77b.tar.zst yuzu-a48c6b947d5314ab804f375cca22af159cc3b77b.zip | |
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/arm_interface.h | 3 | ||||
| -rw-r--r-- | src/core/arm/interpreter/arm_interpreter.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index eee4726db..4dfe0570b 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -8,7 +8,7 @@ #include "common/common_types.h" /// Generic ARM11 CPU interface -class ARM_Interface { +class ARM_Interface : NonCopyable { public: ARM_Interface() { m_num_instructions = 0; @@ -75,5 +75,4 @@ private: u64 m_num_instructions; ///< Number of instructions executed - DISALLOW_COPY_AND_ASSIGN(ARM_Interface); }; diff --git a/src/core/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h index f3c86f8dd..625c0c652 100644 --- a/src/core/arm/interpreter/arm_interpreter.h +++ b/src/core/arm/interpreter/arm_interpreter.h @@ -63,5 +63,4 @@ private: ARMul_State* m_state; - DISALLOW_COPY_AND_ASSIGN(ARM_Interpreter); }; |