move -Wno-c99-designator and -Wno-c++20-designator to source file

baidu · Aug 6, 2024 · 6cca06b · 6cca06b
1 parent ea8c52b
commit 6cca06b
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 33 deletions.
diff --git a/src/babylon/any.cpp b/src/babylon/any.cpp
@@ -1,9 +1,6 @@
 #include "babylon/any.h"
 
-#pragma clang diagnostic push
-#if __clang__
-#pragma clang diagnostic ignored "-Wc++20-designator"
-#endif // __clang__
+#include "babylon/protect.h"
 
 BABYLON_NAMESPACE_BEGIN
 
@@ -71,4 +68,4 @@ Any& Any::ref(const Descriptor* descriptor, void* instance) noexcept {
 
 BABYLON_NAMESPACE_END
 
-#pragma clang diagnostic pop
+#include "babylon/unprotect.h"
diff --git a/src/babylon/any.h b/src/babylon/any.h
@@ -4,10 +4,7 @@
 
 #include <memory> // std::unique_ptr
 
-#pragma clang diagnostic push
-#if __clang__
-#pragma clang diagnostic ignored "-Wc++20-designator"
-#endif // __clang__
+#include "babylon/protect.h"
 
 BABYLON_NAMESPACE_BEGIN
 
@@ -308,6 +305,6 @@ class Any {
 
 BABYLON_NAMESPACE_END
 
-#pragma clang diagnostic pop
+#include "babylon/unprotect.h"
 
 #include "babylon/any.hpp"
diff --git a/src/babylon/any.hpp b/src/babylon/any.hpp
@@ -8,10 +8,7 @@
 
 #include <cassert> // ::assert
 
-#pragma clang diagnostic push
-#if __clang__
-#pragma clang diagnostic ignored "-Wc++20-designator"
-#endif // __clang__
+#include "babylon/protect.h"
 
 BABYLON_NAMESPACE_BEGIN
 
@@ -476,4 +473,4 @@ inline ::std::unique_ptr<void, void (*)(void*)> Any::release() noexcept {
 
 BABYLON_NAMESPACE_END
 
-#pragma clang diagnostic pop
+#include "babylon/unprotect.h"
diff --git a/src/babylon/logging/async_file_appender.cpp b/src/babylon/logging/async_file_appender.cpp
@@ -4,10 +4,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 
-#pragma clang diagnostic push
-#if __clang__
-#pragma clang diagnostic ignored "-Wc++20-designator"
-#endif // __clang__
+#include "babylon/protect.h"
 
 BABYLON_NAMESPACE_BEGIN
 
@@ -149,4 +146,4 @@ void AsyncFileAppender::write_use_plain_writev(Destination& dest,
 
 BABYLON_NAMESPACE_END
 
-#pragma clang diagnostic pop
+#include "babylon/unprotect.h"
diff --git a/src/babylon/logging/log_entry.cpp b/src/babylon/logging/log_entry.cpp
@@ -1,9 +1,6 @@
 #include "babylon/logging/log_entry.h"
 
-#pragma clang diagnostic push
-#if __clang__
-#pragma clang diagnostic ignored "-Wc++20-designator"
-#endif // __clang__
+#include "babylon/protect.h"
 
 BABYLON_NAMESPACE_BEGIN
 
@@ -120,4 +117,4 @@ void LogStreamBuffer::overflow_page_table() noexcept {
 
 BABYLON_NAMESPACE_END
 
-#pragma clang diagnostic pop
+#include "babylon/unprotect.h"
diff --git a/src/babylon/logging/log_severity.h b/src/babylon/logging/log_severity.h
@@ -2,6 +2,8 @@
 
 #include "babylon/string_view.h" // StringView
 
+#include "babylon/protect.h"
+
 BABYLON_NAMESPACE_BEGIN
 
 class LogSeverity {
@@ -33,17 +35,12 @@ class LogSeverity {
  private:
   int8_t _value {DEBUG};
 
-#pragma clang diagnostic push
-#if __clang__
-#pragma clang diagnostic ignored "-Wc99-designator"
-#endif // __clang__
   static constexpr StringView names[NUM] = {
       [DEBUG] = "DEBUG",
       [INFO] = "INFO",
       [WARNING] = "WARNING",
       [FATAL] = "FATAL",
   };
-#pragma clang diagnostic pop
 };
 
 inline constexpr LogSeverity::LogSeverity(int8_t value) noexcept
@@ -64,3 +61,5 @@ inline ::std::basic_ostream<C, T>& operator<<(::std::basic_ostream<C, T>& os,
 }
 
 BABYLON_NAMESPACE_END
+
+#include "babylon/unprotect.h"
diff --git a/src/babylon/protect.h b/src/babylon/protect.h
@@ -23,6 +23,11 @@
 #pragma push_macro("F")
 #undef F
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wunknown-warning-option"
+#pragma GCC diagnostic ignored "-Wc99-designator"
+
 #else // BAIDU_PROTECT_H
 #error("protect.h without unprotect.h")
 #endif // BAIDU_PROTECT_H
diff --git a/src/babylon/unprotect.h b/src/babylon/unprotect.h
@@ -26,4 +26,6 @@
 // 例如baidu/feed-mlarch/feature-extract-framework中定义了F
 #pragma pop_macro("F")
 
+#pragma GCC diagnostic pop
+
 #endif // BABYLON_UNPROTECT_H
diff --git a/test/concurrent/test_sched_interface.cpp b/test/concurrent/test_sched_interface.cpp
@@ -4,8 +4,7 @@
 
 #include <future> // ::std::async
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++20-designator"
+#include "babylon/protect.h"
 
 using ::babylon::Futex;
 using ::babylon::SchedInterface;
@@ -199,4 +198,4 @@ TEST(futex_interface, futex_value_read_write_as_atomic) {
   }
 }
 
-#pragma clang diagnostic pop
+#include "babylon/unprotect.h"