From 800e05346a69f94bb594609fd1c5532715f37e15 Mon Sep 17 00:00:00 2001
From: Wang Xin <xinwang614@gmail.com>
Date: Fri, 28 Oct 2022 10:16:09 +0800
Subject: [PATCH] fix pragma-pack warning on macos (#47399)

---
 cmake/flags.cmake                         | 3 ++-
 paddle/fluid/operators/math/bloomfilter.h | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmake/flags.cmake b/cmake/flags.cmake
index 4c26366c5ac..0267f251e49 100644
--- a/cmake/flags.cmake
+++ b/cmake/flags.cmake
@@ -221,7 +221,8 @@ if(APPLE)
       -Werror=braced-scalar-init
       -Werror=uninitialized
       -Werror=tautological-constant-out-of-range-compare
-      -Werror=literal-conversion)
+      -Werror=literal-conversion
+      -Werror=pragma-pack)
 endif()
 
 if(WITH_HETERPS AND WITH_PSLIB)
diff --git a/paddle/fluid/operators/math/bloomfilter.h b/paddle/fluid/operators/math/bloomfilter.h
index ba907b5012b..ce019a30ed9 100644
--- a/paddle/fluid/operators/math/bloomfilter.h
+++ b/paddle/fluid/operators/math/bloomfilter.h
@@ -26,7 +26,7 @@ namespace paddle {
 namespace operators {
 namespace math {
 
-#pragma pack(4)
+#pragma pack(push, 4)
 struct bloomfilter {
   uint64_t magic_num;
   uint64_t m;
@@ -34,6 +34,8 @@ struct bloomfilter {
   uint64_t count;
   unsigned char bit_vector[1];
 };
+#pragma pack(pop)
+
 int bloomfilter_get(const struct bloomfilter *bloomfilter,
                     const void *key,
                     size_t len);
-- 
GitLab