sal/rtl/string.cxx | 7 -------
sal/rtl/ustring.cxx | 7 -------
2 files changed, 14 deletions(-)
New commits:
commit 76400f66096a5cdc64cbd72ed9a94961b3200216
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Oct 27 15:55:12 2023 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Dec 11 23:03:53 2023 +0100
Step 3 of removing cargo-cult pragma pack around rtl_[u]String
see 8ae3ae4bf75fdd0aaa132c956d9da029baa3adc6 "Step 1 of removing cargo-cult
pragma pack around rtl_[u]String"
Change-Id: If6c2ea0ab2e7e61cdbc880d7b27d2af7f816e66d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158568
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index 95f51ad288d0..05f87475df0b 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -31,13 +31,6 @@
#include <rtl/math.h>
-#if defined _WIN32
-// Temporary check to verify that the #pragma pack around rtl_String is indeed
cargo cult and can
-// safely be removed:
-static_assert(alignof (rtl_String) == 4);
-static_assert(sizeof (rtl_String) == 12);
-#endif
-
/* ======================================================================= */
#if USE_SDT_PROBES
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 6bc595b7f3bf..fe9795710b50 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -40,13 +40,6 @@
#include <rtl/math.h>
-#if defined _WIN32
-// Temporary check to verify that the #pragma pack around rtl_uString is
indeed cargo cult and can
-// safely be removed:
-static_assert(alignof (rtl_uString) == 4);
-static_assert(sizeof (rtl_uString) == 12);
-#endif
-
/* ======================================================================= */
#if USE_SDT_PROBES
