Merge branch 'hle-interface-updates'

2014-04-27 21:25:16 -04:00 · 2014-04-27 21:25:16 -04:00 · 438dba40c1
commit 438dba40c1
parent 2d1c8078c9 a48c6b947d
31 changed files with 623 additions and 175 deletions
--- a/src/common/common.h
+++ b/src/common/common.h
@ -159,9 +159,4 @@ enum EMUSTATE_CHANGE
    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_