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 3a08f037db64ac68bb841c2ab2f040b91a0bb6ed..783c421e8307b2f95df6732777358fc974d59a79 100644 (file)
--- 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 2505be3aff7eb26aac8bddf925479fa1fa3bda7a..9ebf705ef6331d2d35ce7bc45b941e307164ed5d 100644 (file)
--- 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 b0d536654cbfd284e0c0378aa5e2a289fac14b40..7f63177dcd6a8bcddd84721ac12911957d74d627 100644 (file)
--- 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 644f07e8f0bf0e6c1c31c6074d201eaa082fc235..9a36a3c84b32e892e471634d170995472b732a53 100644 (file)
--- 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 7f7324ca29f8c85dbf3670cf01c852dc3c53868a..c4fc32aa8227ea61f013497fac6367742605ce27 100644 (file)
--- 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"