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/Maps | |
| 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/Maps')
| -rw-r--r-- | src/server/game/Maps/Map.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 3bbd6068e4e..43fcbaba31c 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -210,12 +210,7 @@ public: ZLiquidStatus getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, LiquidData* data = 0); }; -// 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 struct InstanceTemplate { @@ -241,11 +236,7 @@ struct ZoneDynamicInfo uint32 LightFadeInTime; }; -#if defined(__GNUC__) -#pragma pack() -#else #pragma pack(pop) -#endif #define MAX_HEIGHT 100000.0f // can be use for find ground height at surface #define INVALID_HEIGHT -100000.0f // for check, must be equal to VMAP_INVALID_HEIGHT, real value for unknown height is VMAP_INVALID_HEIGHT_VALUE |