Merge branch 'master+listmode'

[user/henk/code/inspircd.git] / src / modules / extra / m_regex_re2.cpp

diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp
index 544e3060e26aa74d3eaf1e57bfef57f0e7d9fd6f..c4657bf8b10c06e28df3c5321d9ad393daa651b7 100644 (file)
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -18,16 +18,20 @@
  */
 
 
-#if defined __GNUC__
+#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"
 # pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
-#include "inspircd.h"
-#include "modules/regex.h"
 #include <re2/re2.h>
 
-
-/* $CompileFlags: -std=c++11 */
 /* $LinkerFlags: -lre2 */
 
 class RE2Regex : public Regex