m_ssl_gnutls Strip unrecognized tokens from the priority string if configured to...

[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 99b490da543fe0805d4b41315c888f1879177379..c4657bf8b10c06e28df3c5321d9ad393daa651b7 100644 (file)
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -18,28 +18,21 @@
  */
 
 
-#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>
 
-
-/* $ModDesc: Regex Provider Module for RE2 Regular Expressions */
-/* $CompileFlags: -std=c++11 */
 /* $LinkerFlags: -lre2 */
-/* $ModDep: modules/regex.h */
-
-class RE2Exception : public ModuleException
-{
- public:
-        RE2Exception(const std::string& rx, const std::string& error)
-               : ModuleException(std::string("Error in regex ") + rx + ": " + error)
-       {
-       }
-};
 
 class RE2Regex : public Regex
 {
@@ -50,11 +43,11 @@ class RE2Regex : public Regex
        {
                if (!regexcl.ok())
                {
-                       throw RE2Exception(rx, regexcl.error());
+                       throw RegexException(rx, regexcl.error());
                }
        }
 
-       bool Matches(const std::string& text)
+       bool Matches(const std::string& text) CXX11_OVERRIDE
        {
                return RE2::FullMatch(text, regexcl);
        }
@@ -64,7 +57,7 @@ class RE2Factory : public RegexFactory
 {
  public:
        RE2Factory(Module* m) : RegexFactory(m, "regex/re2") { }
-       Regex* Create(const std::string& expr)
+       Regex* Create(const std::string& expr) CXX11_OVERRIDE
        {
                return new RE2Regex(expr);
        }
@@ -77,7 +70,6 @@ class ModuleRegexRE2 : public Module
  public:
        ModuleRegexRE2() : ref(this)
        {
-               ServerInstance->Modules->AddService(ref);
        }
 
        Version GetVersion() CXX11_OVERRIDE