Update detection in module loading commands that relied on old command module names

[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 56d80cd685127ec6c2100fef1b00c2edb0772f70..544e3060e26aa74d3eaf1e57bfef57f0e7d9fd6f 100644 (file)
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -30,15 +30,6 @@
 /* $CompileFlags: -std=c++11 */
 /* $LinkerFlags: -lre2 */
 
-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
 {
        RE2 regexcl;
@@ -48,11 +39,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);
        }
@@ -62,7 +53,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);
        }
@@ -75,7 +66,6 @@ class ModuleRegexRE2 : public Module
  public:
        ModuleRegexRE2() : ref(this)
        {
-               ServerInstance->Modules->AddService(ref);
        }
 
        Version GetVersion() CXX11_OVERRIDE