From f9a08ac1c9cc1774b5f808364d9a011965641a3b Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Sun, 22 Jun 2014 14:07:23 -0500
Subject: Core/Dependencies: Remove ACE_Singleton dependency from the Log and
 DelayExecutor classes.

Removed an unused function.
---
 src/server/shared/Logging/Log.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/server/shared/Logging/Log.h')

diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index 5fa638e2f40..5f404fcfe70 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -26,14 +26,11 @@
 
 #include <unordered_map>
 #include <string>
-#include <ace/Singleton.h>
 
 #define LOGGER_ROOT "root"
 
 class Log
 {
-    friend class ACE_Singleton<Log, ACE_Thread_Mutex>;
-
     typedef std::unordered_map<std::string, Logger> LoggerMap;
     typedef std::unordered_map<std::string, Logger const*> CachedLoggerContainer;
 
@@ -42,6 +39,12 @@ class Log
         ~Log();
 
     public:
+        static Log* instance()
+        {
+            static Log* instance = new Log();
+            return instance;
+        }
+
         void LoadFromConfig();
         void Close();
         bool ShouldLog(std::string const& type, LogLevel level);
@@ -127,7 +130,7 @@ inline void Log::outMessage(std::string const& filter, LogLevel level, const cha
     va_end(ap);
 }
 
-#define sLog ACE_Singleton<Log, ACE_Thread_Mutex>::instance()
+#define sLog Log::instance()
 
 #if PLATFORM != PLATFORM_WINDOWS
 #define TC_LOG_MESSAGE_BODY(filterType__, level__, ...)                 \
-- 
cgit v1.2.3