Replaced all remaining ACE based Singletons

Replaced ACE base AutoPtr class with shared_ptr
Note: worldserver currently broken due to MapUpdater threading failure (ACE ofc, what else could it be)

3 files changed, 18 insertions, 8 deletions

diff --git a/src/server/shared/Threading/Callback.h b/src/server/shared/Threading/Callback.h
index a6aa11b3958..5d9dc9a760d 100644
--- a/src/server/shared/Threading/Callback.h
+++ b/src/server/shared/Threading/Callback.h
@@ -26,10 +26,6 @@ typedef std::promise<QueryResult> QueryResultPromise;
 typedef std::future<PreparedQueryResult> PreparedQueryResultFuture;
 typedef std::promise<PreparedQueryResult> PreparedQueryResultPromise;
 
-/*! A simple template using ACE_Future to manage callbacks from the thread and object that
-    issued the request. <ParamType> is variable type of parameter that is used as parameter
-    for the callback function.
-*/
 #define CALLBACK_STAGE_INVALID uint8(-1)
 
 template <typename Result, typename ParamType, bool chain = false>
@@ -210,4 +206,4 @@ class QueryCallback_2
         QueryCallback_2& operator=(QueryCallback_2 const& right) = delete;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/server/shared/Threading/DelayExecutor.cpp b/src/server/shared/Threading/DelayExecutor.cpp
index 0db45a8ff8f..ef3c028fd97 100644
--- a/src/server/shared/Threading/DelayExecutor.cpp
+++ b/src/server/shared/Threading/DelayExecutor.cpp
@@ -1,4 +1,20 @@
-#include <ace/Singleton.h>
+/*
+* Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
+*
+* This program is free software; you can redistribute it and/or modify it
+* under the terms of the GNU General Public License as published by the
+* Free Software Foundation; either version 2 of the License, or (at your
+* option) any later version.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+* more details.
+*
+* You should have received a copy of the GNU General Public License along
+* with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include <ace/Thread_Mutex.h>
 #include <ace/Log_Msg.h>
 
diff --git a/src/server/shared/Threading/DelayExecutor.h b/src/server/shared/Threading/DelayExecutor.h
index 5eaaacdb98b..2a3721263fc 100644
--- a/src/server/shared/Threading/DelayExecutor.h
+++ b/src/server/shared/Threading/DelayExecutor.h
@@ -8,7 +8,6 @@
 class DelayExecutor : protected ACE_Task_Base
 {
     public:
-
         DelayExecutor();
         virtual ~DelayExecutor();
 
@@ -25,7 +24,6 @@ class DelayExecutor : protected ACE_Task_Base
         virtual int svc();
 
     private:
-
         ACE_Activation_Queue queue_;
         ACE_Method_Request* pre_svc_hook_;
         ACE_Method_Request* post_svc_hook_;