More '= delete;' member functions.

Generated by clang-tidy modernize-use-equals-delete
MeteorAtRains · Oct 23, 2018 · 52eb23a · 52eb23a
1 parent 14d7eb6
commit 52eb23a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,6 +1,6 @@
 ---
 # Only run a few checks for now.
-Checks:          '-clang-*,clang-analyzer-security.*,google-runtime-references'
+Checks:          'modernize-use-equals-delete'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false

diff --git a/muduo/base/Singleton.h b/muduo/base/Singleton.h
@@ -32,6 +32,9 @@ template<typename T>
 class Singleton : noncopyable
 {
  public:
+  Singleton() = delete;
+  ~Singleton() = delete;
+
   static T& instance()
   {
     pthread_once(&ponce_, &Singleton::init);
@@ -40,9 +43,6 @@ class Singleton : noncopyable
   }
 
  private:
-  Singleton();
-  ~Singleton();
-
   static void init()
   {
     value_ = new T();

diff --git a/muduo/base/ThreadLocalSingleton.h b/muduo/base/ThreadLocalSingleton.h
@@ -18,6 +18,8 @@ template<typename T>
 class ThreadLocalSingleton : noncopyable
 {
  public:
+  ThreadLocalSingleton() = delete;
+  ~ThreadLocalSingleton() = delete;
 
   static T& instance()
   {
@@ -35,9 +37,6 @@ class ThreadLocalSingleton : noncopyable
   }
 
  private:
-  ThreadLocalSingleton();
-  ~ThreadLocalSingleton();
-
   static void destructor(void* obj)
   {
     assert(obj == t_value_);

diff --git a/muduo/base/noncopyable.h b/muduo/base/noncopyable.h
@@ -6,13 +6,13 @@ namespace muduo
 
 class noncopyable
 {
+ public:
+  noncopyable(const noncopyable&) = delete;
+  void operator=(const noncopyable&) = delete;
+
  protected:
   noncopyable() = default;
   ~noncopyable() = default;
-
- private:
-  noncopyable(const noncopyable&) = delete;
-  void operator=(const noncopyable&) = delete;
 };
 
 }  // namespace muduo