Reset diagnostic pragmas after including external headers (#1661).

diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index 65b6b2b006ca3b3edffec828ed425ea5a8966d69..0eb2f7511db12fac056a3a7655bf56c641276238 100644 (file)
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -28,11 +28,16 @@
 
 // Ignore OpenLDAP deprecation warnings on OS X Yosemite and newer.
 #if defined __APPLE__
+# pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 #include <ldap.h>
 
+#ifdef __APPLE__
+# pragma GCC diagnostic pop
+#endif
+
 #ifdef _WIN32
 # pragma comment(lib, "libldap_r.lib")
 # pragma comment(lib, "liblber.lib")

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index d0ccebc478550037a05a91f7d59463fe53ae3dd2..02d2a08a9699ba42c2b5f5e90ee16adf933bca26 100644 (file)
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -28,6 +28,9 @@
 /// $PackageInfo: require_system("debian") libmysqlclient-dev
 /// $PackageInfo: require_system("ubuntu") libmysqlclient-dev
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
 
 // Fix warnings about the use of `long long` on C++03.
 #if defined __clang__
@@ -40,6 +43,10 @@
 #include <mysql.h>
 #include "modules/sql.h"
 
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 #ifdef _WIN32
 # pragma comment(lib, "libmysql.lib")
 #endif

diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp
index 4bcf287cad1248909dd9b0c728c99ad7b71827b3..e5b27fcd52d67ff3481d9330b5294d954f032b3d 100644 (file)
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -28,6 +28,10 @@
 #include "inspircd.h"
 #include "modules/regex.h"
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
+
 // Fix warnings about the use of `long long` on C++03 and
 // shadowing on GCC.
 #if defined __clang__
@@ -39,6 +43,10 @@
 
 #include <re2/re2.h>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 class RE2Regex : public Regex
 {
        RE2 regexcl;

diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 7807a69f032b257a9e400026a56cbf923f2050ec..47c5b01a4b0aa1abc6a8395a56c306ea6dc7a08c 100644 (file)
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -30,6 +30,10 @@
 #include "inspircd.h"
 #include "modules/sql.h"
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
+
 // Fix warnings about the use of `long long` on C++03.
 #if defined __clang__
 # pragma clang diagnostic ignored "-Wc++11-long-long"
@@ -39,6 +43,10 @@
 
 #include <sqlite3.h>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 #ifdef _WIN32
 # pragma comment(lib, "sqlite3.lib")
 #endif

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index ce1dbaeaf71feefe43d53365ae1c1c923246c0a5..5785b1ab4d8ecba76f6586d60c432f2163574eaf 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -37,6 +37,10 @@
 #include "modules/ssl.h"
 #include <memory>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
+
 // Fix warnings about the use of commas at end of enumerator lists on C++03.
 #if defined __clang__
 # pragma clang diagnostic ignored "-Wc++11-extensions"
@@ -54,6 +58,10 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 #ifndef GNUTLS_VERSION_NUMBER
 #define GNUTLS_VERSION_NUMBER LIBGNUTLS_VERSION_NUMBER
 #define GNUTLS_VERSION LIBGNUTLS_VERSION

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 4937e7cb00f536fc4dda031c004fa81d3c496233..8d6b1e98ca1675f70042921e64c60cc6c51a523c 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -34,6 +34,10 @@
 #include "iohook.h"
 #include "modules/ssl.h"
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
+
 // Ignore OpenSSL deprecation warnings on OS X Lion and newer.
 #if defined __APPLE__
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@@ -50,6 +54,10 @@
 #include <openssl/err.h>
 #include <openssl/dh.h>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 #ifdef _WIN32
 # pragma comment(lib, "ssleay32.lib")
 # pragma comment(lib, "libeay32.lib")

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index c4b5dc1f29be996fc2ba658b76b57a27efd31b94..b768789f1cf0259d5cdd64dbd4a73a633d7daf28 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -28,6 +28,10 @@
 #include "iohook.h"
 #include "modules/httpd.h"
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
+
 // Fix warnings about the use of commas at end of enumerator lists and long long
 // on C++03.
 #if defined __clang__
@@ -44,11 +48,15 @@
 
 // Fix warnings about shadowing in http_parser.
 #ifdef __GNUC__
-//# pragma GCC diagnostic ignored "-Wshadow"
+# pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
 #include <http_parser.c>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 class ModuleHttpServer;
 
 static ModuleHttpServer* HttpModule;

diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index e3ca22a2b9a6c18aa718cc1727eed6304b7a083d..7afb9b3cfbfbcaa170919f885e57bf56928f3db5 100644 (file)
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -22,6 +22,9 @@
 /// $CompilerFlags: -Ivendor_directory("sha2")
 /// $CompilerFlags: require_compiler("GCC") -Wno-long-long
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
 
 // Fix warnings about the use of `long long` on C++03.
 #if defined __clang__
@@ -35,6 +38,10 @@
 
 #include <sha2.c>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 class HashSHA256 : public HashProvider
 {
  public: