Merge pull request Light-City#196 from L-Super/master

修复设计模式-单例的一些错误
wuqingzhao · Apr 10, 2022 · 88083a0 · 88083a0
2 parents 5d23c9d + 646f9e1
commit 88083a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/design_pattern/singleton/README.md b/design_pattern/singleton/README.md
@@ -114,7 +114,7 @@ private:
     static singleton *p;
     static mutex lock_;
 public:
-    singleton *instance();
+    static singleton *instance();
 
     // 实现一个内嵌垃圾回收类
     class CGarbo
@@ -131,6 +131,7 @@ public:
 
 singleton *singleton::p = nullptr;
 singleton::CGarbo Garbo;
+std::mutex singleton::lock_;
 
 singleton* singleton::instance() {
     if (p == nullptr) {

diff --git a/design_pattern/singleton/dcl_singleton.cpp b/design_pattern/singleton/dcl_singleton.cpp
@@ -14,7 +14,7 @@ class singleton {
     static singleton *p;
     static mutex lock_;
 public:
-    singleton *instance();
+    static singleton *instance();
 
     // 实现一个内嵌垃圾回收类
     class CGarbo
@@ -31,6 +31,7 @@ class singleton {
 
 singleton *singleton::p = nullptr;
 singleton::CGarbo Garbo;
+std::mutex singleton::lock_;
 
 singleton* singleton::instance() {
     if (p == nullptr) {

diff --git a/design_pattern/singleton/static_local_singleton.cpp b/design_pattern/singleton/static_local_singleton.cpp
@@ -1,5 +1,7 @@
 //
 // Created by light on 20-2-7.
+// 在C++11标准下，《Effective C++》提出了一种更优雅的单例模式实现，使用函数内的 local static 对象。
+// 这种方法也被称为Meyers' Singleton。
 //
 
 #include <iostream>
@@ -8,15 +10,14 @@ using namespace std;
 
 class singleton {
 private:
-    static singleton *p;
     singleton() {}
 public:
-    singleton *instance();
+    static singleton &instance();
 };
 
-singleton *singleton::instance() {
+singleton &singleton::instance() {
     static singleton p;
-    return &p;
+    return p;
 }