summaryrefslogtreecommitdiff
path: root/src/connectionList.cpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2014-06-29 00:06:23 +0000
committerChristian Pointner <equinox@anytun.org>2014-06-29 00:06:23 +0000
commit92a551b96e625257def26771155ebd64c6d8757e (patch)
tree7d5b2d0a043f746bfb10ccc9679ac59646a95b72 /src/connectionList.cpp
parentwhile(1) vs. for(;;) (diff)
fixed not working singletons - still not threadsafe but at least they don't pretend to be
Diffstat (limited to 'src/connectionList.cpp')
-rw-r--r--src/connectionList.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/connectionList.cpp b/src/connectionList.cpp
index f5236e1..804aa6e 100644
--- a/src/connectionList.cpp
+++ b/src/connectionList.cpp
@@ -38,20 +38,12 @@
#include "connectionList.h"
-ConnectionList* ConnectionList::inst = NULL;
-Mutex ConnectionList::instMutex;
ConnectionList& gConnectionList = ConnectionList::instance();
-
ConnectionList& ConnectionList::instance()
{
- Lock lock(instMutex);
- static instanceCleaner c;
- if(!inst) {
- inst = new ConnectionList();
- }
-
- return *inst;
+ static ConnectionList instance;
+ return instance;
}
ConnectionList::ConnectionList()