From ee7ed5d395fb3cad94d07e347a914b6743e4178e Mon Sep 17 00:00:00 2001
From: Simon Zeni <simon.zeni@collabora.com>
Date: Wed, 3 Jul 2024 15:24:02 -0400
Subject: [PATCH] aux/util: remove ignore warning diagnostics in
 u_trace_marker.h

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2272>
---
 src/xrt/auxiliary/util/u_trace_marker.c | 10 ----------
 src/xrt/auxiliary/util/u_trace_marker.h | 13 -------------
 2 files changed, 23 deletions(-)

diff --git a/src/xrt/auxiliary/util/u_trace_marker.c b/src/xrt/auxiliary/util/u_trace_marker.c
index 74150d923..595f15a7e 100644
--- a/src/xrt/auxiliary/util/u_trace_marker.c
+++ b/src/xrt/auxiliary/util/u_trace_marker.c
@@ -23,12 +23,6 @@
 
 DEBUG_GET_ONCE_BOOL_OPTION(tracing, "XRT_TRACING", false)
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-// ATOMIC_VAR_INIT was deprecated in C14 which is used by PERCETTO_* defines.
-#pragma GCC diagnostic ignored "-Wdeprecated-pragma"
-#endif
-
 PERCETTO_CATEGORY_DEFINE(U_TRACE_CATEGORIES)
 
 PERCETTO_TRACK_DEFINE(pc_cpu, PERCETTO_TRACK_EVENTS);
@@ -42,10 +36,6 @@ PERCETTO_TRACK_DEFINE(pa_cpu, PERCETTO_TRACK_EVENTS);
 PERCETTO_TRACK_DEFINE(pa_draw, PERCETTO_TRACK_EVENTS);
 PERCETTO_TRACK_DEFINE(pa_wait, PERCETTO_TRACK_EVENTS);
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
 static enum u_trace_which static_which;
 static bool static_inited = false;
 
diff --git a/src/xrt/auxiliary/util/u_trace_marker.h b/src/xrt/auxiliary/util/u_trace_marker.h
index e8948a9fd..4100b786d 100644
--- a/src/xrt/auxiliary/util/u_trace_marker.h
+++ b/src/xrt/auxiliary/util/u_trace_marker.h
@@ -16,15 +16,6 @@
 
 #include <stdio.h>
 
-#if defined(__cplusplus) && (defined(__clang__) || defined(__GNUC__))
-#pragma GCC diagnostic push
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic ignored "-Wpedantic"
-#elif defined(__clang__)
-#pragma GCC diagnostic ignored "-Wc++20-designator"
-#endif
-#endif
-
 #if defined(XRT_FEATURE_TRACING) && defined(XRT_HAVE_PERCETTO)
 #define U_TRACE_PERCETTO
 #include <percetto.h>
@@ -383,7 +374,3 @@ PERCETTO_TRACK_DECLARE(pa_wait);
 #ifdef __cplusplus
 }
 #endif
-
-#if defined(__cplusplus) && (defined(__clang__) || defined(__GNUC__))
-#pragma GCC diagnostic pop
-#endif