Просмотр исходного кода

Common: Move NonCopyable to common_types.h

Yuri Kunde Schlesner 11 лет назад
Родитель
Сommit
6ad71c216b
2 измененных файлов с 10 добавлено и 10 удалено
  1. 0 10
      src/common/common.h
  2. 10 0
      src/common/common_types.h

+ 0 - 10
src/common/common.h

@@ -13,16 +13,6 @@
 
 
 #define STACKALIGN
 #define STACKALIGN
 
 
-// An inheritable class to disallow the copy constructor and operator= functions
-class NonCopyable {
-protected:
-    NonCopyable() = default;
-    ~NonCopyable() = default;
-
-    NonCopyable(NonCopyable&) = delete;
-    NonCopyable& operator=(NonCopyable&) = delete;
-};
-
 #include "common/assert.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/logging/log.h"
 #include "common/common_types.h"
 #include "common/common_types.h"

+ 10 - 0
src/common/common_types.h

@@ -73,6 +73,16 @@ union t64 {
     u8  _u8[8];             ///< 8-bit unsigned char(s)
     u8  _u8[8];             ///< 8-bit unsigned char(s)
 };
 };
 
 
+// An inheritable class to disallow the copy constructor and operator= functions
+class NonCopyable {
+protected:
+    NonCopyable() = default;
+    ~NonCopyable() = default;
+
+    NonCopyable(NonCopyable&) = delete;
+    NonCopyable& operator=(NonCopyable&) = delete;
+};
+
 namespace Common {
 namespace Common {
 /// Rectangle data structure
 /// Rectangle data structure
 class Rect {
 class Rect {