From 6b753c54edcd88b35341c6912cfef84b6dc5ac5b Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Sun, 14 Oct 2018 20:15:52 +0200 Subject: [PATCH] Add #pragma pack to FString --- src/include/final/emptyfstring.h | 5 +++++ src/include/final/fstring.h | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/include/final/emptyfstring.h b/src/include/final/emptyfstring.h index 5e941879..7835a8b2 100644 --- a/src/include/final/emptyfstring.h +++ b/src/include/final/emptyfstring.h @@ -38,6 +38,10 @@ namespace fc //---------------------------------------------------------------------- // class emptyFString //---------------------------------------------------------------------- + +#pragma pack(push) +#pragma pack(1) + class emptyFString { public: @@ -58,6 +62,7 @@ private: // Data Member static const FString* empty_string; }; +#pragma pack(pop) // emptyFString inline functions //---------------------------------------------------------------------- diff --git a/src/include/final/fstring.h b/src/include/final/fstring.h index eca1666c..89aedc39 100644 --- a/src/include/final/fstring.h +++ b/src/include/final/fstring.h @@ -71,6 +71,9 @@ typedef std::vector FStringList; // class FString //---------------------------------------------------------------------- +#pragma pack(push) +#pragma pack(1) + class FString { public: @@ -274,7 +277,7 @@ class FString std::size_t bufsize; mutable char* c_string; }; - +#pragma pack(pop) // FString inline functions //----------------------------------------------------------------------