removed DISALLOW_COPY_AND_ASSIGN in favor of NonCopyable class

This commit is contained in:
bunnei 2014-04-27 18:29:51 -04:00
parent 451a14f98c
commit a48c6b947d
8 changed files with 2 additions and 21 deletions

View File

@ -159,9 +159,4 @@ enum EMUSTATE_CHANGE
EMUSTATE_CHANGE_STOP EMUSTATE_CHANGE_STOP
}; };
// This should be used in the private: declarations for a class
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \
void operator=(const TypeName&)
#endif // _COMMON_H_ #endif // _COMMON_H_

View File

@ -8,7 +8,7 @@
#include "common/common_types.h" #include "common/common_types.h"
/// Generic ARM11 CPU interface /// Generic ARM11 CPU interface
class ARM_Interface { class ARM_Interface : NonCopyable {
public: public:
ARM_Interface() { ARM_Interface() {
m_num_instructions = 0; m_num_instructions = 0;
@ -75,5 +75,4 @@ private:
u64 m_num_instructions; ///< Number of instructions executed u64 m_num_instructions; ///< Number of instructions executed
DISALLOW_COPY_AND_ASSIGN(ARM_Interface);
}; };

View File

@ -63,5 +63,4 @@ private:
ARMul_State* m_state; ARMul_State* m_state;
DISALLOW_COPY_AND_ASSIGN(ARM_Interpreter);
}; };

View File

@ -27,9 +27,6 @@ public:
return "gsp::Gpu"; return "gsp::Gpu";
} }
private:
DISALLOW_COPY_AND_ASSIGN(Interface);
}; };
} // namespace } // namespace

View File

@ -29,9 +29,6 @@ public:
return "hid:USER"; return "hid:USER";
} }
private:
DISALLOW_COPY_AND_ASSIGN(Interface);
}; };
} // namespace } // namespace

View File

@ -32,9 +32,6 @@ public:
*/ */
Syscall::Result Sync(); Syscall::Result Sync();
private:
DISALLOW_COPY_AND_ASSIGN(Interface);
}; };
} // namespace } // namespace

View File

@ -6,7 +6,7 @@
#include "common/common.h" #include "common/common.h"
class RendererBase { class RendererBase : NonCopyable {
public: public:
/// Used to reference a framebuffer /// Used to reference a framebuffer
@ -52,6 +52,4 @@ protected:
f32 m_current_fps; ///< Current framerate, should be set by the renderer f32 m_current_fps; ///< Current framerate, should be set by the renderer
int m_current_frame; ///< Current frame, should be set by the renderer int m_current_frame; ///< Current frame, should be set by the renderer
private:
DISALLOW_COPY_AND_ASSIGN(RendererBase);
}; };

View File

@ -87,5 +87,4 @@ private:
u8 m_xfb_top_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth * 4]; u8 m_xfb_top_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth * 4];
u8 m_xfb_bottom_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth * 4]; u8 m_xfb_bottom_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth * 4];
DISALLOW_COPY_AND_ASSIGN(RendererOpenGL);
}; };