diff options
| author | Christian Pointner <equinox@anytun.org> | 2014-06-29 00:06:23 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2014-06-29 00:06:23 +0000 |
| commit | 92a551b96e625257def26771155ebd64c6d8757e (patch) | |
| tree | 7d5b2d0a043f746bfb10ccc9679ac59646a95b72 /src/log.cpp | |
| parent | while(1) vs. for(;;) (diff) | |
fixed not working singletons - still not threadsafe but at least they don't pretend to be
Diffstat (limited to 'src/log.cpp')
| -rw-r--r-- | src/log.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
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) |