From ba9e0de36dae55d4399235277df77cd40af3d36b Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 20 Apr 2015 01:54:18 +0200 Subject: 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 --- src/server/shared/Database/Field.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/server/shared/Database/Field.h') diff --git a/src/server/shared/Database/Field.h b/src/server/shared/Database/Field.h index b88fb56cb06..1bbd264482f 100644 --- a/src/server/shared/Database/Field.h +++ b/src/server/shared/Database/Field.h @@ -255,11 +255,7 @@ class Field Field(); ~Field(); - #if defined(__GNUC__) - #pragma pack(1) - #else #pragma pack(push, 1) - #endif struct { uint32 length; // Length (prepared strings only) @@ -267,11 +263,7 @@ class Field enum_field_types type; // Field type bool raw; // Raw bytes? (Prepared statement or ad hoc) } data; - #if defined(__GNUC__) - #pragma pack() - #else #pragma pack(pop) - #endif void SetByteValue(void const* newValue, size_t const newSize, enum_field_types newType, uint32 length); void SetStructuredValue(char* newValue, enum_field_types newType); -- cgit v1.2.3