From 79440b3d9d0c2388f4ee04e81561702847e7e34a Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Sun, 22 Jun 2014 13:17:47 -0500
Subject: Shared/Misc: Removed some more ACE dependencies

---
 src/server/shared/Dynamic/ObjectRegistry.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/server/shared/Dynamic/ObjectRegistry.h')

diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index be7ce00ac05..486b75b467e 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -20,12 +20,9 @@
 #define TRINITY_OBJECTREGISTRY_H
 
 #include "Define.h"
-#include <ace/Singleton.h>
 
 #include <string>
-#include <vector>
 #include <map>
-#include <unordered_map>
 
 /** ObjectRegistry holds all registry item of the same type
  */
@@ -33,7 +30,13 @@ template<class T, class Key = std::string>
 class ObjectRegistry
 {
     public:
-        typedef std::map<Key, T *> RegistryMapType;
+        typedef std::map<Key, T*> RegistryMapType;
+
+        static ObjectRegistry<T, Key>* instance()
+        {
+            static ObjectRegistry<T, Key>* instance = new ObjectRegistry<T, Key>();
+            return instance;
+        }
 
         /// Returns a registry item
         const T* GetRegistryItem(Key key) const
-- 
cgit v1.2.3


From 28b61812cf0d87b84aefaa0889844b6288f93b93 Mon Sep 17 00:00:00 2001
From: leak <leak@bitmx.net>
Date: Mon, 23 Jun 2014 21:02:13 +0200
Subject: Fix non-PCH build

---
 src/server/shared/Dynamic/ObjectRegistry.h    | 1 +
 src/server/shared/Logging/AppenderConsole.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/server/shared/Dynamic/ObjectRegistry.h')

diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index 486b75b467e..e9e57415073 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <map>
+#include <vector>
 
 /** ObjectRegistry holds all registry item of the same type
  */
diff --git a/src/server/shared/Logging/AppenderConsole.cpp b/src/server/shared/Logging/AppenderConsole.cpp
index 14d434e35b8..8102d3b6021 100644
--- a/src/server/shared/Logging/AppenderConsole.cpp
+++ b/src/server/shared/Logging/AppenderConsole.cpp
@@ -15,11 +15,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <sstream>
+#if PLATFORM == PLATFORM_WINDOWS
+    #include <windows.h>
+#endif
+
 #include "AppenderConsole.h"
 #include "Config.h"
 #include "Util.h"
 
-#include <sstream>
 
 AppenderConsole::AppenderConsole(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags):
 Appender(id, name, APPENDER_CONSOLE, level, flags), _colored(false)
-- 
cgit v1.2.3