Merge pull request #590 from SaberUK/master+module-logging

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

diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp
index 3c15f5568886e0d05688fe23938c773427331ccc..5d2294c871ac2311cb11c10893b0cbdf866ea79d 100644 (file)
--- a/src/modules/extra/m_regex_stdlib.cpp
+++ b/src/modules/extra/m_regex_stdlib.cpp
@@ -20,10 +20,6 @@
 #include "modules/regex.h"
 #include <regex>
 
-/* $ModDesc: Regex Provider Module for std::regex Regular Expressions */
-/* $ModConfig: <stdregex type="ecmascript">
- *  Specify the Regular Expression engine to use here. Valid settings are
- *  bre, ere, awk, grep, egrep, ecmascript (default if not specified)*/
 /* $CompileFlags: -std=c++11 */
 /* $ModDep: modules/regex.h */
 
@@ -52,7 +48,7 @@ class StdRegex : public Regex
                }
        }
 
-       virtual bool Matches(const std::string& text)
+       bool Matches(const std::string& text)
        {
                return std::regex_search(text, regexcl);
        }
@@ -81,12 +77,12 @@ public:
                OnRehash(NULL);
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Regex Provider Module for std::regex", VF_VENDOR);
        }
 
-       void OnRehash(User* u)
+       void OnRehash(User* u) CXX11_OVERRIDE
        {
                ConfigTag* Conf = ServerInstance->Config->ConfValue("stdregex");
                std::string regextype = Conf->getString("type", "ecmascript");