X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_regex_re2.cpp;h=e3e793d6dc49166714e875de09abca6ee280692c;hb=a1db12cb2e7024981291cbd7e51b73c9a684d76c;hp=2525b70abba9f2c98a4d0bc0944066682717b111;hpb=eaf658de3d1ef984c9a0b4273a9cfbd3029f8b5b;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 2525b70ab..e3e793d6d 100644
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -1,8 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Peter Powell <petpow@saberuk.com>
- *   Copyright (C) 2012 ChrisTX <chris@rev-crew.info>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013-2014, 2016-2017, 2019 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -17,18 +17,36 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/// $CompilerFlags: find_compiler_flags("re2" "-std=c++11")
+/// $LinkerFlags: find_linker_flags("re2" "-lre2")
+
+/// $PackageInfo: require_system("arch") pkgconf re2
+/// $PackageInfo: require_system("darwin") pkg-config re2
+/// $PackageInfo: require_system("debian" "8.0") libre2-dev pkg-config
+/// $PackageInfo: require_system("ubuntu" "15.10") libre2-dev pkg-config
 
-#if defined __GNUC__
-# pragma GCC diagnostic ignored "-Wshadow"
-#endif
 
 #include "inspircd.h"
 #include "modules/regex.h"
-#include <re2/re2.h>
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
 
-/* $CompileFlags: -std=c++11 */
-/* $LinkerFlags: -lre2 */
+// 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 <re2/re2.h>
+
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
 
 class RE2Regex : public Regex
 {
@@ -66,12 +84,11 @@ class ModuleRegexRE2 : public Module
  public:
 	ModuleRegexRE2() : ref(this)
 	{
-		ServerInstance->Modules->AddService(ref);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Regex Provider Module for RE2", VF_VENDOR);
+		return Version("Provides the re2 regular expression engine which uses the RE2 library.", VF_VENDOR);
 	}
 };