From 92a551b96e625257def26771155ebd64c6d8757e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@anytun.org>
Date: Sun, 29 Jun 2014 00:06:23 +0000
Subject: fixed not working singletons - still not threadsafe but at least they
 don't pretend to be

---
 src/log.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/log.cpp')

diff --git a/src/log.cpp b/src/log.cpp
index 0851444..3b162cf 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -36,8 +36,6 @@
 
 #include "threadUtils.hpp"
 
-Log* Log::inst = NULL;
-Mutex Log::instMutex;
 Log& cLog = Log::instance();
 
 LogStringBuilder::LogStringBuilder(LogStringBuilder const& src) : log(src.log), prio(src.prio)
@@ -57,13 +55,8 @@ LogStringBuilder::~LogStringBuilder()
 
 Log& Log::instance()
 {
-  Lock lock(instMutex);
-  static instanceCleaner c;
-  if(!inst) {
-    inst = new Log();
-  }
-
-  return *inst;
+  static Log instance;
+  return instance;
 }
 
 void Log::addTarget(std::string conf)
-- 
cgit v1.2.3