Unite SSL service providers and SSL profile classes

[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 2525b70abba9f2c98a4d0bc0944066682717b111..4bcf287cad1248909dd9b0c728c99ad7b71827b3 100644 (file)
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -17,18 +17,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/// $CompilerFlags: find_compiler_flags("re2" "")
+/// $LinkerFlags: find_linker_flags("re2" "-lre2")
+
+/// $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>
 
+// 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
 
-/* $CompileFlags: -std=c++11 */
-/* $LinkerFlags: -lre2 */
+#include <re2/re2.h>
 
 class RE2Regex : public Regex
 {
@@ -66,7 +75,6 @@ class ModuleRegexRE2 : public Module
  public:
        ModuleRegexRE2() : ref(this)
        {
-               ServerInstance->Modules->AddService(ref);
        }
 
        Version GetVersion() CXX11_OVERRIDE