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/GameObject | |
| 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/GameObject')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 68a5aba619b..dacc44c27ad 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -539,7 +539,7 @@ struct GameObjectTemplate }; // Benchmarked: Faster than std::map (insert/find) -typedef UNORDERED_MAP<uint32, GameObjectTemplate> GameObjectTemplateContainer; +typedef std::unordered_map<uint32, GameObjectTemplate> GameObjectTemplateContainer; class OPvPCapturePoint; struct TransportAnimation; |