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/game/Weather/WeatherMgr.cpp | |
| 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/game/Weather/WeatherMgr.cpp')
| -rw-r--r-- | src/server/game/Weather/WeatherMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp index 9faecdf7c99..7a48d935a21 100644 --- a/src/server/game/Weather/WeatherMgr.cpp +++ b/src/server/game/Weather/WeatherMgr.cpp @@ -35,8 +35,8 @@ namespace WeatherMgr namespace { - typedef UNORDERED_MAP<uint32, Trinity::AutoPtr<Weather, ACE_Null_Mutex> > WeatherMap; - typedef UNORDERED_MAP<uint32, WeatherData> WeatherZoneMap; + typedef std::unordered_map<uint32, Trinity::AutoPtr<Weather, ACE_Null_Mutex> > WeatherMap; + typedef std::unordered_map<uint32, WeatherData> WeatherZoneMap; WeatherMap m_weathers; WeatherZoneMap mWeatherZoneMap; |