Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.h

2 files changed, 5 insertions, 6 deletions

diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h
index b373f0459c9..84d0dc14eca 100644
--- a/src/server/shared/Logging/Appender.h
+++ b/src/server/shared/Logging/Appender.h
@@ -20,8 +20,7 @@
 
 #include "Define.h"
 #include <time.h>
-#include "Dynamic/UnorderedMap.h"
-
+#include <unordered_map>
 #include <string>
 
 // Values assigned have their equivalent in enum ACE_Log_Priority
@@ -105,6 +104,6 @@ class Appender
         AppenderFlags flags;
 };
 
-typedef UNORDERED_MAP<uint8, Appender*> AppenderMap;
+typedef std::unordered_map<uint8, Appender*> AppenderMap;
 
 #endif
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index 73c5601b95b..5fa638e2f40 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -23,8 +23,8 @@
 #include "Appender.h"
 #include "Logger.h"
 #include "LogWorker.h"
-#include "Dynamic/UnorderedMap.h"
 
+#include <unordered_map>
 #include <string>
 #include <ace/Singleton.h>
 
@@ -34,8 +34,8 @@ class Log
 {
     friend class ACE_Singleton<Log, ACE_Thread_Mutex>;
 
-    typedef UNORDERED_MAP<std::string, Logger> LoggerMap;
-    typedef UNORDERED_MAP<std::string, Logger const*> CachedLoggerContainer;
+    typedef std::unordered_map<std::string, Logger> LoggerMap;
+    typedef std::unordered_map<std::string, Logger const*> CachedLoggerContainer;
 
     private:
         Log();