diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-04-20 01:54:18 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-05-19 21:47:48 +0100 |
| commit | ba9e0de36dae55d4399235277df77cd40af3d36b (patch) | |
| tree | 938e881522d1b8883d8f3a68480b18f82f1ea95b /src/server/game/Entities/Creature | |
| parent | 8a013ba0fbec8dd8dba8909f9fd149c2ec79c6a0 (diff) | |
Core/Misc: Removed gcc specific packing pragma syntax - only unsupported (now) versions required it
(cherry picked from commit 4c7c2abf03b692e67a89d2ba0856aec1553c8ae1)
Conflicts:
src/server/bnetserver/Packets/BitStream.h
src/server/shared/Common.h
Diffstat (limited to 'src/server/game/Entities/Creature')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 433d4a21b27..6f82d5dda4a 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -170,12 +170,7 @@ struct CreatureTemplate // Benchmarked: Faster than std::map (insert/find) typedef std::unordered_map<uint32, CreatureTemplate> CreatureTemplateContainer; -// GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push, N), also any gcc version not support it at some platform -#if defined(__GNUC__) -#pragma pack(1) -#else #pragma pack(push, 1) -#endif // Defines base stats for creatures (used to calculate HP/mana/armor/attackpower/rangedattackpower/all damage). struct CreatureBaseStats @@ -307,12 +302,7 @@ enum ChatType CHAT_TYPE_END = 255 }; -// GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform -#if defined(__GNUC__) -#pragma pack() -#else #pragma pack(pop) -#endif // `creature_addon` table struct CreatureAddon |