diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-09-16 10:55:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-16 10:55:29 +0200 |
| commit | 05953e35b03a8136f5906e0add89412f02bfca36 (patch) | |
| tree | e29f4334f627de8f9955b48c01beafed57710d2c | |
| parent | bdfde49fb6d9a8787c072b759d4af27584308e1b (diff) | |
| parent | 13cf5f4c3bb48b194374e98055ae7cb2bedd41ff (diff) | |
Merge pull request #1222 from SaberUK/master+warnings
Fix various compiler warnings
| -rw-r--r-- | src/modules/extra/m_geoip.cpp | 7 | ||||
| -rw-r--r-- | src/modules/extra/m_ldap.cpp | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp index 564599bf8..b350ede90 100644 --- a/src/modules/extra/m_geoip.cpp +++ b/src/modules/extra/m_geoip.cpp @@ -26,6 +26,13 @@ #include "inspircd.h" #include "xline.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__ +# pragma GCC diagnostic ignored "-pedantic" +#endif + #include <GeoIP.h> #ifdef _WIN32 diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index 67a4e6745..78cce50bd 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -23,6 +23,11 @@ #include "inspircd.h" #include "modules/ldap.h" +// Ignore OpenLDAP deprecation warnings on OS X Yosemite and newer. +#if defined __APPLE__ +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + #include <ldap.h> #ifdef _WIN32 |