X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_regex_re2.cpp;h=c4657bf8b10c06e28df3c5321d9ad393daa651b7;hb=63aa8d0d42f619c52d382bde3e6ba2e5e23b12ac;hp=04ec52dc6815f80014ce24c8462d942e8b0e733c;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp
index 04ec52dc6..c4657bf8b 100644
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -18,27 +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>
 
-
-/* $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
 {
@@ -49,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);
 	}
@@ -63,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);
 	}
@@ -76,7 +70,6 @@ class ModuleRegexRE2 : public Module
  public:
 	ModuleRegexRE2() : ref(this)
 	{
-		ServerInstance->Modules->AddService(ref);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE