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/resolver.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/resolver.cpp')

diff --git a/src/resolver.cpp b/src/resolver.cpp
index afca093..aae1f5f 100644
--- a/src/resolver.cpp
+++ b/src/resolver.cpp
@@ -80,19 +80,12 @@ void ResolveHandler<Proto>::operator()(const boost::system::error_code& e, boost
   }
 }
 
-Resolver* Resolver::inst = NULL;
-Mutex Resolver::instMutex;
 Resolver& gResolver = Resolver::instance();
 
 Resolver& Resolver::instance()
 {
-  Lock lock(instMutex);
-  static instanceCleaner c;
-  if(!inst) {
-    inst = new Resolver();
-  }
-
-  return *inst;
+  static Resolver instance;
+  return instance;
 }
 
 Resolver::Resolver() : udp_resolver_(io_service_), tcp_resolver_(io_service_), thread_(NULL)
-- 
cgit v1.2.3