diff options
| author | 2018-07-31 03:27:13 +0100 | |
|---|---|---|
| committer | 2019-01-25 02:53:58 +0000 | |
| commit | b2a7623c331831a1706e1a64aeb4ca7a5d656a86 (patch) | |
| tree | 09145f3563eb4091cf9d00123447f4c19541931b /src/modules | |
| parent | Move m_regex_stdlib out of extras now it can always be built. (diff) | |
Stop silencing warnings about `long long` not existing.
We use C++14 now which has `long long`.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/extra/m_geoip.cpp | 11 | ||||
| -rw-r--r-- | src/modules/extra/m_mysql.cpp | 7 | ||||
| -rw-r--r-- | src/modules/extra/m_regex_re2.cpp | 8 | ||||
| -rw-r--r-- | src/modules/extra/m_sqlite3.cpp | 7 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 14 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_openssl.cpp | 12 | ||||
| -rw-r--r-- | src/modules/m_sha256.cpp | 8 |
7 files changed, 2 insertions, 65 deletions
diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp index 7e2c1d43d..aa829354d 100644 --- a/src/modules/extra/m_geoip.cpp +++ b/src/modules/extra/m_geoip.cpp @@ -30,17 +30,6 @@ #include "modules/stats.h" #include "modules/whois.h" -// 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" -#elif defined __GNUC__ -# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) -# pragma GCC diagnostic ignored "-Wpedantic" -# else -# pragma GCC diagnostic ignored "-pedantic" -# endif -#endif - #include <GeoIP.h> #ifdef _WIN32 diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index c1f7bde34..c590750cf 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -29,13 +29,6 @@ /// $PackageInfo: require_system("ubuntu") libmysqlclient-dev -// Fix warnings about the use of `long long` on C++03. -#if defined __clang__ -# pragma clang diagnostic ignored "-Wc++11-long-long" -#elif defined __GNUC__ -# pragma GCC diagnostic ignored "-Wlong-long" -#endif - #include "inspircd.h" #include <mysql.h> #include "modules/sql.h" diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp index 0cc341a35..81e96b509 100644 --- a/src/modules/extra/m_regex_re2.cpp +++ b/src/modules/extra/m_regex_re2.cpp @@ -28,12 +28,8 @@ #include "inspircd.h" #include "modules/regex.h" -// Fix warnings about the use of `long long` on C++03 and -// shadowing on GCC. -#if defined __clang__ -# pragma clang diagnostic ignored "-Wc++11-long-long" -#elif defined __GNUC__ -# pragma GCC diagnostic ignored "-Wlong-long" +// Fix warnings about shadowing on GCC. +#if defined __GNUC__ # pragma GCC diagnostic ignored "-Wshadow" #endif diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index e31a41c5c..14b3c20fc 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -30,13 +30,6 @@ #include "inspircd.h" #include "modules/sql.h" -// Fix warnings about the use of `long long` on C++03. -#if defined __clang__ -# pragma clang diagnostic ignored "-Wc++11-long-long" -#elif defined __GNUC__ -# pragma GCC diagnostic ignored "-Wlong-long" -#endif - #include <sqlite3.h> #ifdef _WIN32 diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 8317ed93d..5b0f4a536 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -37,20 +37,6 @@ #include "modules/ssl.h" #include <memory> -// 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" -#elif defined __GNUC__ -# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) -# pragma GCC diagnostic ignored "-Wpedantic" -# else -# pragma GCC diagnostic ignored "-pedantic" -# endif -#endif - -// Fix warnings about using std::auto_ptr on C++11 or newer. -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #include <gnutls/gnutls.h> #include <gnutls/x509.h> diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 125190c7d..f34a90094 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -34,18 +34,6 @@ #include "iohook.h" #include "modules/ssl.h" -// Ignore OpenSSL deprecation warnings on OS X Lion and newer. -#if defined __APPLE__ -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - -// Fix warnings about the use of `long long` on C++03. -#if defined __clang__ -# pragma clang diagnostic ignored "-Wc++11-long-long" -#elif defined __GNUC__ -# pragma GCC diagnostic ignored "-Wlong-long" -#endif - #include <openssl/ssl.h> #include <openssl/err.h> #include <openssl/dh.h> diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp index 1243c6a13..348c122ae 100644 --- a/src/modules/m_sha256.cpp +++ b/src/modules/m_sha256.cpp @@ -20,16 +20,8 @@ */ /// $CompilerFlags: -Ivendor_directory("sha2") -/// $CompilerFlags: require_compiler("GCC") -Wno-long-long -// Fix warnings about the use of `long long` on C++03. -#if defined __clang__ -# pragma clang diagnostic ignored "-Wc++11-long-long" -#elif defined __GNUC__ -# pragma GCC diagnostic ignored "-Wlong-long" -#endif - #include "inspircd.h" #include "modules/hash.h" |
