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/shared/Database/Field.h | |
| 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/shared/Database/Field.h')
| -rw-r--r-- | src/server/shared/Database/Field.h | 8 |
1 files changed, 0 insertions, 8 deletions
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); |