diff options
| author |  bunnei | 2014-04-27 21:25:16 -0400 |
|---|---|---|
| committer | bunnei | 2014-04-27 21:25:16 -0400 |
| commit | 438dba40c1def91e9de252ef05f8650464e5c0c2 (patch) | |
| tree | 8f323d6095dfefe9d00f34cc4d7229be58a9f409 /src/core/arm/arm_interface.h | |
| parent | Merge pull request #4 from cpp3ds/master (diff) | |
| parent | removed DISALLOW_COPY_AND_ASSIGN in favor of NonCopyable class (diff) | |
| download | yuzu-438dba40c1def91e9de252ef05f8650464e5c0c2.tar.gz yuzu-438dba40c1def91e9de252ef05f8650464e5c0c2.tar.xz yuzu-438dba40c1def91e9de252ef05f8650464e5c0c2.zip | |
Merge branch 'hle-interface-updates'
Diffstat (limited to 'src/core/arm/arm_interface.h')
| -rw-r--r-- | src/core/arm/arm_interface.h | 3 |
1 files changed, 1 insertions, 2 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 @@ | |||
| 8 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 9 | 9 | ||
| 10 | /// Generic ARM11 CPU interface | 10 | /// Generic ARM11 CPU interface |
| 11 | class ARM_Interface { | 11 | class ARM_Interface : NonCopyable { |
| 12 | public: | 12 | public: |
| 13 | ARM_Interface() { | 13 | ARM_Interface() { |
| 14 | m_num_instructions = 0; | 14 | m_num_instructions = 0; |
| @@ -75,5 +75,4 @@ private: | |||
| 75 | 75 | ||
| 76 | u64 m_num_instructions; ///< Number of instructions executed | 76 | u64 m_num_instructions; ///< Number of instructions executed |
| 77 | 77 | ||
| 78 | DISALLOW_COPY_AND_ASSIGN(ARM_Interface); | ||
| 79 | }; | 78 | }; |