7 files changed, 15 insertions, 84 deletions
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index d6d55ec7a..69ffb537d 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1954,12 +1954,6 @@
 #<module name="swhois">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Test module: Enable this to create a command useful in testing
-# flood control. To avoid accidental use on live networks, the server
-# name must contain ".test" to load the module
-#<module name="testnet">
-
-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Timed bans module: Adds timed channel bans with the /TBAN command.
 #<module name="timedbans">
 
diff --git a/include/numericbuilder.h b/include/numericbuilder.h
index 9f4cfd7dd..36cfeedb4 100644
--- a/include/numericbuilder.h
+++ b/include/numericbuilder.h
@@ -113,7 +113,7 @@ class Numeric::Builder : public GenericBuilder<Sep, SendEmpty, WriteNumericSink>
 {
  public:
 	Builder(LocalUser* user, unsigned int num, bool addparam = true, size_t additionalsize = 0)
-		: GenericBuilder<Sep, SendEmpty, WriteNumericSink>(WriteNumericSink(user), num, addparam, additionalsize + user->nick.size())
+		: Numeric::GenericBuilder<Sep, SendEmpty, WriteNumericSink>(WriteNumericSink(user), num, addparam, additionalsize + user->nick.size())
 	{
 	}
 };
diff --git a/make/common.pm b/make/common.pm
index 638cc668a..f5bbedb3f 100644
--- a/make/common.pm
+++ b/make/common.pm
@@ -76,13 +76,13 @@ sub module_installed($) {
 sub get_cpu_count {
 	my $count = 1;
 	if ($^O =~ /bsd/) {
-		$count = `sysctl -n hw.ncpu`;
+		$count = `sysctl -n hw.ncpu 2>/dev/null` || 1;
 	} elsif ($^O eq 'darwin') {
-		$count = `sysctl -n hw.activecpu`;
+		$count = `sysctl -n hw.activecpu 2>/dev/null` || 1;
 	} elsif ($^O eq 'linux') {
-		$count = `getconf _NPROCESSORS_ONLN`;
+		$count = `getconf _NPROCESSORS_ONLN 2>/dev/null` || 1;
 	} elsif ($^O eq 'solaris') {
-		$count = `psrinfo -p`;
+		$count = `psrinfo -p 2>/dev/null` || 1;
 	}
 	chomp($count);
 	return $count;
diff --git a/src/coremods/core_ison.cpp b/src/coremods/core_ison.cpp
index 8deeefc59..49da8931a 100644
--- a/src/coremods/core_ison.cpp
+++ b/src/coremods/core_ison.cpp
@@ -44,7 +44,7 @@ class IsonReplyBuilder : public Numeric::Builder<' ', true>
 {
  public:
 	IsonReplyBuilder(LocalUser* user)
-		: Builder<' ', true>(user, 303)
+		: Numeric::Builder<' ', true>(user, 303)
 	{
 	}
 
diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index 703ebbed3..ecc406a8c 100644
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -105,7 +105,7 @@ class WhoisChanListNumericBuilder : public Numeric::GenericBuilder<' ', false, W
 {
  public:
 	WhoisChanListNumericBuilder(WhoisContextImpl& whois)
-		: GenericBuilder<' ', false, WhoisNumericSink>(WhoisNumericSink(whois), 319, true, whois.GetSource()->nick.size() + whois.GetTarget()->nick.size() + 1)
+		: Numeric::GenericBuilder<' ', false, WhoisNumericSink>(WhoisNumericSink(whois), 319, true, whois.GetSource()->nick.size() + whois.GetTarget()->nick.size() + 1)
 	{
 	}
 };
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 10b97b359..8d786cc3f 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -28,8 +28,12 @@
 // Fix warnings about the use of commas at end of enumerator lists on C++03.
 #if defined __clang__
 # pragma clang diagnostic ignored "-Wc++11-extensions"
-#elif defined __GNUC__ && __GNUC__ < 6
-# pragma GCC diagnostic ignored "-pedantic"
+#elif defined __GNUC__
+# if __GNUC__ < 6
+#  pragma GCC diagnostic ignored "-pedantic"
+# else
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+# endif
 #endif
 
 #include <gnutls/gnutls.h>
@@ -58,8 +62,8 @@
 # pragma comment(lib, "libgnutls-28.lib")
 #endif
 
-/* $CompileFlags: -std=c++03 pkgconfincludes("gnutls","/gnutls/gnutls.h","") eval("print `libgcrypt-config --cflags | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */
-/* $LinkerFlags: -std=c++03 rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") eval("print `libgcrypt-config --libs | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */
+/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") eval("print `libgcrypt-config --cflags | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */
+/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") eval("print `libgcrypt-config --libs | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */
 
 // These don't exist in older GnuTLS versions
 #if INSPIRCD_GNUTLS_HAS_VERSION(2, 1, 7)
diff --git a/src/modules/m_testnet.cpp b/src/modules/m_testnet.cpp
deleted file mode 100644
index 6e05ed681..000000000
--- a/src/modules/m_testnet.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *
- * 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
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "inspircd.h"
-
-class CommandTest : public Command
-{
- public:
-	CommandTest(Module* parent) : Command(parent, "TEST", 1)
-	{
-		syntax = "<action> <parameters>";
-	}
-
-	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
-	{
-		if (parameters[0] == "flood")
-		{
-			unsigned int count = parameters.size() > 1 ? atoi(parameters[1].c_str()) : 100;
-			std::string line = parameters.size() > 2 ? parameters[2] : ":z.z NOTICE !flood :Flood text";
-			for(unsigned int i=0; i < count; i++)
-				user->Write(line);
-		}
-		else if (parameters[0] == "freeze" && IS_LOCAL(user) && parameters.size() > 1)
-		{
-			IS_LOCAL(user)->CommandFloodPenalty += atoi(parameters[1].c_str());
-		}
-		return CMD_SUCCESS;
-	}
-};
-
-class ModuleTest : public Module
-{
-	CommandTest cmd;
- public:
-	ModuleTest() : cmd(this)
-	{
-	}
-
-	void init() CXX11_OVERRIDE
-	{
-		if (!strstr(ServerInstance->Config->ServerName.c_str(), ".test"))
-			throw ModuleException("Don't load modules without reading their descriptions!");
-	}
-
-	Version GetVersion() CXX11_OVERRIDE
-	{
-		return Version("Provides a module for testing the server while linked in a network", VF_VENDOR|VF_OPTCOMMON);
-	}
-};
-
-MODULE_INIT(ModuleTest)