diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/arm_interface.h | 3 | ||||
| -rw-r--r-- | src/core/arm/interpreter/arm_interpreter.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/gsp.h | 3 | ||||
| -rw-r--r-- | src/core/hle/service/hid.h | 3 | ||||
| -rw-r--r-- | src/core/hle/service/srv.h | 3 |
5 files changed, 1 insertions, 12 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 | }; |
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: | |||
| 63 | 63 | ||
| 64 | ARMul_State* m_state; | 64 | ARMul_State* m_state; |
| 65 | 65 | ||
| 66 | DISALLOW_COPY_AND_ASSIGN(ARM_Interpreter); | ||
| 67 | }; | 66 | }; |
diff --git a/src/core/hle/service/gsp.h b/src/core/hle/service/gsp.h index 3b1846082..5ba09ab70 100644 --- a/src/core/hle/service/gsp.h +++ b/src/core/hle/service/gsp.h | |||
| @@ -27,9 +27,6 @@ public: | |||
| 27 | return "gsp::Gpu"; | 27 | return "gsp::Gpu"; |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | private: | ||
| 31 | |||
| 32 | DISALLOW_COPY_AND_ASSIGN(Interface); | ||
| 33 | }; | 30 | }; |
| 34 | 31 | ||
| 35 | } // namespace | 32 | } // namespace |
diff --git a/src/core/hle/service/hid.h b/src/core/hle/service/hid.h index 746c1b1fc..b17fcfa86 100644 --- a/src/core/hle/service/hid.h +++ b/src/core/hle/service/hid.h | |||
| @@ -29,9 +29,6 @@ public: | |||
| 29 | return "hid:USER"; | 29 | return "hid:USER"; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | private: | ||
| 33 | |||
| 34 | DISALLOW_COPY_AND_ASSIGN(Interface); | ||
| 35 | }; | 32 | }; |
| 36 | 33 | ||
| 37 | } // namespace | 34 | } // namespace |
diff --git a/src/core/hle/service/srv.h b/src/core/hle/service/srv.h index d9ac8fc88..760c976b4 100644 --- a/src/core/hle/service/srv.h +++ b/src/core/hle/service/srv.h | |||
| @@ -32,9 +32,6 @@ public: | |||
| 32 | */ | 32 | */ |
| 33 | Syscall::Result Sync(); | 33 | Syscall::Result Sync(); |
| 34 | 34 | ||
| 35 | private: | ||
| 36 | |||
| 37 | DISALLOW_COPY_AND_ASSIGN(Interface); | ||
| 38 | }; | 35 | }; |
| 39 | 36 | ||
| 40 | } // namespace | 37 | } // namespace |