From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 6 Nov 2023 14:02:24 +0000 (+0100)
Subject: Use #pragma option GCC to avoid warnings, it covers both clang and gcc
X-Git-Tag: rec-5.0.0-beta1~10^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc125378b9292460190a8c5674218ba219707037;p=thirdparty%2Fpdns.git

Use #pragma option GCC to avoid warnings, it covers both clang and gcc
---

diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index 3a08f037db..783c421e83 100644
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -34,10 +34,10 @@
 #include <fstream>
 #include <filesystem>
 #include <utility>
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
 #include <yaml-cpp/yaml.h>
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 
 ReadWriteLock GeoIPBackend::s_state_lock;
 
diff --git a/pdns/dnsbulktest.cc b/pdns/dnsbulktest.cc
index 2505be3aff..9ebf705ef6 100644
--- a/pdns/dnsbulktest.cc
+++ b/pdns/dnsbulktest.cc
@@ -22,13 +22,13 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#pragma clang diagnostic ignored "-Wdeprecated-copy-with-user-provided-copy"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wdeprecated-copy-with-user-provided-copy"
 #include <boost/accumulators/accumulators.hpp>
 #include <boost/array.hpp>
 #include <boost/accumulators/statistics.hpp>
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 #include <boost/program_options.hpp>
 #include "inflighter.cc"
 #include <deque>
diff --git a/pdns/dnstcpbench.cc b/pdns/dnstcpbench.cc
index b0d536654c..7f63177dcd 100644
--- a/pdns/dnstcpbench.cc
+++ b/pdns/dnstcpbench.cc
@@ -22,14 +22,14 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#pragma clang diagnostic ignored "-Wdeprecated-copy-with-user-provided-copy"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wdeprecated-copy-with-user-provided-copy"
 #include <boost/accumulators/statistics/median.hpp>
 #include <boost/accumulators/statistics/mean.hpp>
 #include <boost/accumulators/accumulators.hpp>
 #include <boost/accumulators/statistics.hpp>
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 
 #include <thread>
 
diff --git a/pdns/ixfrdist.cc b/pdns/ixfrdist.cc
index 644f07e8f0..9a36a3c84b 100644
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@ -48,10 +48,10 @@
 #include "logger.hh"
 #include "ixfrdist-stats.hh"
 #include "ixfrdist-web.hh"
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
 #include <yaml-cpp/yaml.h>
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 
 /* BEGIN Needed because of deeper dependencies */
 #include "arguments.hh"
diff --git a/pdns/test-dns_random_hh.cc b/pdns/test-dns_random_hh.cc
index 7f7324ca29..c4fc32aa82 100644
--- a/pdns/test-dns_random_hh.cc
+++ b/pdns/test-dns_random_hh.cc
@@ -7,14 +7,14 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/assign/std/map.hpp>
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#pragma clang diagnostic ignored "-Wdeprecated-copy-with-user-provided-copy"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wdeprecated-copy-with-user-provided-copy"
 #include <boost/accumulators/statistics/median.hpp>
 #include <boost/accumulators/statistics/mean.hpp>
 #include <boost/accumulators/accumulators.hpp>
 #include <boost/accumulators/statistics.hpp>
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 
 #include "arguments.hh"
 #include "dns_random.hh"