diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-03 20:23:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-05-03 20:23:44 +0200 |
| commit | 13ec761ad2cc2aec24f850520f459bb124050a34 (patch) | |
| tree | d22b616621787ecdf81579ae08d3c46b93d471b3 /src/server/game/Entities/Object | |
| parent | 9a8cd0593c985a05dfc0fc9a45dd8d905974505b (diff) | |
| parent | d7b1405725d2f247776f3586df8c3512416f60cd (diff) | |
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
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index ed20a8ae5a8..5e525f1e0d5 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -118,7 +118,7 @@ class WorldObject; class WorldPacket; class ZoneScript; -typedef UNORDERED_MAP<Player*, UpdateData> UpdateDataMapType; +typedef std::unordered_map<Player*, UpdateData> UpdateDataMapType; //! Structure to ease conversions from single 64 bit integer guid into individual bytes, for packet sending purposes //! Nuke this out when porting ObjectGuid from MaNGOS, but preserve the per-byte storage |