Common: Use C++11 deleted functions for NonCopyable

2015-05-06 01:56:18 +07:00 · 2015-05-06 01:56:18 +07:00 · 7a4b717772
parent 1fee769aa0
commit 7a4b717772
1 changed files with 6 additions and 8 deletions
--- a/src/common/common.h
+++ b/src/common/common.h
@ -14,15 +14,13 @@
 #define STACKALIGN

 // An inheritable class to disallow the copy constructor and operator= functions
-class NonCopyable
-{
+class NonCopyable {
 protected:
-    NonCopyable() {}
-    NonCopyable(const NonCopyable&&) {}
-    void operator=(const NonCopyable&&) {}
-private:
-    NonCopyable(NonCopyable&);
-    NonCopyable& operator=(NonCopyable& other);
+    NonCopyable() = default;
+    ~NonCopyable() = default;
+
+    NonCopyable(NonCopyable&) = delete;
+    NonCopyable& operator=(NonCopyable&) = delete;
 };

 #include "common/assert.h"