diff options
author | Shauren <shauren.trinity@gmail.com> | 2014-05-17 14:20:35 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2014-05-17 14:20:35 +0200 |
commit | 1094783715c16faf7553d2391b8bf23bfc51524d (patch) | |
tree | 98ac29f4b341d05ff144492c66ba3406c30d136d /src/server/shared/Logging/Log.h | |
parent | 81b8deef529517a1f13397ff2aa13154bccf86c9 (diff) | |
parent | 4136f3c974d2b08e1e9098fe9ab410db9a6aebd4 (diff) |
Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/shared/Logging/Log.h')
-rw-r--r-- | src/server/shared/Logging/Log.h | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |