Fixed build errors and warnings with -std=c++11

8 files changed, 9 insertions, 17 deletions

diff --git a/modules/extra/m_helpchan.cpp b/modules/extra/m_helpchan.cpp
index b3971f257..08f90b644 100644
--- a/modules/extra/m_helpchan.cpp
+++ b/modules/extra/m_helpchan.cpp
@@ -22,7 +22,7 @@ class HelpChannel : public Module
 		OnReload();
 	}
 
-	EventReturn OnChannelModeSet(Channel *c, User *setter, ChannelModeName Name, const Anope::string &param) anope_override
+	EventReturn OnChannelModeSet(Channel *c, MessageSource &setter, ChannelModeName Name, const Anope::string &param) anope_override
 	{
 		if (Name == CMODE_OP && c && c->ci && c->name.equals_ci(this->HelpChan))
 		{
diff --git a/modules/extra/webcpanel/pages/chanserv/access.cpp b/modules/extra/webcpanel/pages/chanserv/access.cpp
index 71fe1a7e9..dc999c350 100644
--- a/modules/extra/webcpanel/pages/chanserv/access.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/access.cpp
@@ -139,7 +139,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 	return true;
 }
 
-std::set<Anope::string> WebCPanel::ChanServ::Access::GetData() anope_override
+std::set<Anope::string> WebCPanel::ChanServ::Access::GetData()
 {
 	std::set<Anope::string> v;
 	v.insert("channel");
diff --git a/modules/extra/webcpanel/pages/chanserv/akick.cpp b/modules/extra/webcpanel/pages/chanserv/akick.cpp
index bb38c5e06..70fa5b52e 100644
--- a/modules/extra/webcpanel/pages/chanserv/akick.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/akick.cpp
@@ -73,7 +73,7 @@ bool WebCPanel::ChanServ::Akick::OnRequest(HTTPProvider *server, const Anope::st
 	return true;
 }
 
-std::set<Anope::string> WebCPanel::ChanServ::Akick::GetData() anope_override
+std::set<Anope::string> WebCPanel::ChanServ::Akick::GetData()
 {
 	std::set<Anope::string> v;
 	v.insert("channel");
diff --git a/modules/extra/webcpanel/pages/chanserv/set.cpp b/modules/extra/webcpanel/pages/chanserv/set.cpp
index 7d144c6de..889e8f24f 100644
--- a/modules/extra/webcpanel/pages/chanserv/set.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/set.cpp
@@ -128,7 +128,7 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri
 	return true;
 }
 
-std::set<Anope::string> WebCPanel::ChanServ::Set::GetData() anope_override
+std::set<Anope::string> WebCPanel::ChanServ::Set::GetData()
 {
 	std::set<Anope::string> v;
 	v.insert("channel");
diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 181b4dc2e..5a5e650cc 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -238,7 +238,7 @@ class BahamutIRCdProto : public IRCDProto
 	/*
 	  Note: if the stamp is null 0, the below usage is correct of Bahamut
 	*/
-	void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) anope_override
+	void SendSVSKillInternal(const BotInfo *source, User *user, const Anope::string &buf) anope_override
 	{
 		if (source)
 			UplinkSocket::Message(source) << "SVSKILL " << user->nick << " :" << buf;
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index 442d2c8e5..2d69c5f30 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -138,14 +138,6 @@ class ngIRCdProto : public IRCDProto
 		UplinkSocket::Message() << "SERVER " << server->GetName() << " " << server->GetHops() << " :" << server->GetDescription();
 	}
 
-	void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) anope_override
-	{
-		if (source)
-			UplinkSocket::Message(source) << "KILL " << user->nick << " :" << buf;
-		else
-			UplinkSocket::Message(Me) << "KILL " << user->nick << " :" << buf;
-	}
-
 	void SendTopic(BotInfo *bi, Channel *c) anope_override
 	{
 		UplinkSocket::Message(bi) << "TOPIC " << c->name << " :" << c->topic;
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index bafca8016..b54df1863 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -126,7 +126,7 @@ class UnrealIRCdProto : public IRCDProto
 		UplinkSocket::Message() << "BD + G " << x->GetUser() << " " << x->GetHost() << " " << x->By << " " << Anope::CurTime + timeleft << " " << x->Created << " :" << x->GetReason();
 	}
 
-	void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf) anope_override
+	void SendSVSKillInternal(const BotInfo *source, User *user, const Anope::string &buf) anope_override
 	{
 		UplinkSocket::Message(source) << "h " << user->nick << " :" << buf;
 	}
diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp
index faeeae1fc..9cfca1af3 100644
--- a/modules/pseudoclients/memoserv.cpp
+++ b/modules/pseudoclients/memoserv.cpp
@@ -72,7 +72,7 @@ class MyMemoServService : public MemoServService
 				return MEMO_TOO_FAST;
 			else if (!mi->memomax)
 				return MEMO_TARGET_FULL;
-			else if (mi->memomax > 0 && mi->memos->size() >= mi->memomax)
+			else if (mi->memomax > 0 && mi->memos->size() >= static_cast<unsigned>(mi->memomax))
 				return MEMO_TARGET_FULL;
 			else if (mi->HasIgnore(sender))
 				return MEMO_SUCCESS;
@@ -147,9 +147,9 @@ class MyMemoServService : public MemoServService
 				++newcnt;
 		if (newcnt > 0)
 			u->SendMessage(ms, newcnt == 1 ? _("You have 1 new memo.") : _("You have %d new memos."), newcnt);
-		if (nc->memos.memomax > 0 && nc->memos.memos->size() >= nc->memos.memomax)
+		if (nc->memos.memomax > 0 && nc->memos.memos->size() >= static_cast<unsigned>(nc->memos.memomax))
 		{
-			if (nc->memos.memos->size() > nc->memos.memomax)
+			if (nc->memos.memos->size() > static_cast<unsigned>(nc->memos.memomax))
 				u->SendMessage(ms, _("You are over your maximum number of memos (%d). You will be unable to receive any new memos until you delete some of your current ones."), nc->memos.memomax);
 			else
 				u->SendMessage(ms, _("You have reached your maximum number of memos (%d). You will be unable to receive any new memos until you delete some of your current ones."), nc->memos.memomax);