diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-04-20 01:54:18 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-04-20 01:54:18 +0200 |
| commit | 4c7c2abf03b692e67a89d2ba0856aec1553c8ae1 (patch) | |
| tree | aca710086e2f8a2d58fb3e4cc0202582722232c1 /src/server/shared | |
| parent | 9172584ef1a81ee995aa736e66256c3b7582d2ff (diff) | |
Core/Misc: Removed gcc specific packing pragma syntax - only unsupported (now) versions required it
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/Common.h | 8 | ||||
| -rw-r--r-- | src/server/shared/Database/Field.h | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index 11c9ad3b27f..8a1ccf6029a 100644 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -133,22 +133,14 @@ LocaleConstant GetLocaleByName(const std::string& name); typedef std::vector<std::string> StringVector; -#if defined(__GNUC__) -#pragma pack(1) -#else #pragma pack(push, 1) -#endif struct LocalizedString { char const* Str[TOTAL_LOCALES]; }; -#if defined(__GNUC__) -#pragma pack() -#else #pragma pack(pop) -#endif // we always use stdlibc++ std::max/std::min, undefine some not C++ standard defines (Win API and some other platforms) #ifdef max diff --git a/src/server/shared/Database/Field.h b/src/server/shared/Database/Field.h index c25e987808e..65d1c131e32 100644 --- a/src/server/shared/Database/Field.h +++ b/src/server/shared/Database/Field.h @@ -267,11 +267,7 @@ class Field Field(); ~Field(); - #if defined(__GNUC__) - #pragma pack(1) - #else #pragma pack(push, 1) - #endif struct { uint32 length; // Length (prepared strings only) @@ -279,11 +275,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, uint32 length); |
