Merge branch 'master+sslconnmsg'

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

diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index c845ab37414991d44e909a67bd734772b65879c9..8a1d5424880d6d479ea9286494a2a0ec921f5433 100644 (file)
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -57,14 +57,9 @@ public:
                regfree(&regbuf);
        }
 
-       bool Matches(const std::string& text)
+       bool Matches(const std::string& text)  CXX11_OVERRIDE
        {
-               if (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0)
-               {
-                       // Bang. :D
-                       return true;
-               }
-               return false;
+               return (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0);
        }
 };
 
@@ -72,7 +67,7 @@ class TREFactory : public RegexFactory
 {
  public:
        TREFactory(Module* m) : RegexFactory(m, "regex/tre") {}
-       Regex* Create(const std::string& expr)
+       Regex* Create(const std::string& expr) CXX11_OVERRIDE
        {
                return new TRERegex(expr);
        }
@@ -85,7 +80,6 @@ class ModuleRegexTRE : public Module
  public:
        ModuleRegexTRE() : trf(this)
        {
-               ServerInstance->Modules->AddService(trf);
        }
 
        Version GetVersion() CXX11_OVERRIDE