Replace the override macro with the override keyword.

11 files changed, 90 insertions, 90 deletions

diff --git a/src/modules/m_spanningtree/cachetimer.h b/src/modules/m_spanningtree/cachetimer.h
index 489194b86..f3658c8b5 100644
--- a/src/modules/m_spanningtree/cachetimer.h
+++ b/src/modules/m_spanningtree/cachetimer.h
@@ -25,5 +25,5 @@ class CacheRefreshTimer : public Timer
 {
  public:
 	CacheRefreshTimer();
-	bool Tick(time_t TIME) CXX11_OVERRIDE;
+	bool Tick(time_t TIME) override;
 };
diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 434528e46..3f1a4faf8 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -45,55 +45,55 @@ class CommandRConnect : public Command
 {
  public:
 	CommandRConnect(Module* Creator);
-	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE;
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, const Params& parameters) override;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override;
 };
 
 class CommandRSQuit : public Command
 {
  public:
 	CommandRSQuit(Module* Creator);
-	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE;
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, const Params& parameters) override;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override;
 };
 
 class CommandMap : public Command
 {
  public:
 	CommandMap(Module* Creator);
-	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE;
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, const Params& parameters) override;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override;
 };
 
 class CommandSVSJoin : public ServerCommand
 {
  public:
 	CommandSVSJoin(Module* Creator) : ServerCommand(Creator, "SVSJOIN", 2) { }
-	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& params) override;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override;
 };
 
 class CommandSVSPart : public ServerCommand
 {
  public:
 	CommandSVSPart(Module* Creator) : ServerCommand(Creator, "SVSPART", 2) { }
-	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& params) override;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override;
 };
 
 class CommandSVSNick : public ServerCommand
 {
  public:
 	CommandSVSNick(Module* Creator) : ServerCommand(Creator, "SVSNICK", 3) { }
-	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& params) override;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override;
 };
 
 class CommandMetadata : public ServerCommand
 {
  public:
 	CommandMetadata(Module* Creator) : ServerCommand(Creator, "METADATA", 2) { }
-	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& params) override;
 
 	class Builder : public CmdBuilder
 	{
@@ -150,8 +150,8 @@ class CommandFJoin : public ServerCommand
 	void ProcessModeUUIDPair(const std::string& item, TreeServer* sourceserver, Channel* chan, Modes::ChangeList* modechangelist, FwdFJoinBuilder& fwdfjoin);
  public:
 	CommandFJoin(Module* Creator) : ServerCommand(Creator, "FJOIN", 3) { }
-	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_LOCALONLY; }
+	CmdResult Handle(User* user, Params& params) override;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_LOCALONLY; }
 
 	class Builder : public CmdBuilder
 	{
@@ -187,14 +187,14 @@ class CommandFMode : public ServerCommand
 {
  public:
 	CommandFMode(Module* Creator) : ServerCommand(Creator, "FMODE", 3) { }
-	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& params) override;
 };
 
 class CommandFTopic : public ServerCommand
 {
  public:
 	CommandFTopic(Module* Creator) : ServerCommand(Creator, "FTOPIC", 4, 5) { }
-	CmdResult Handle(User* user, Params& params) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& params) override;
 
 	class Builder : public CmdBuilder
 	{
@@ -237,7 +237,7 @@ class CommandResync : public ServerOnlyServerCommand<CommandResync>
  public:
 	CommandResync(Module* Creator) : ServerOnlyServerCommand<CommandResync>(Creator, "RESYNC", 1) { }
 	CmdResult HandleServer(TreeServer* server, Params& parameters);
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_LOCALONLY; }
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_LOCALONLY; }
 };
 
 class SpanningTree::CommandAway : public UserOnlyServerCommand<SpanningTree::CommandAway>
@@ -265,7 +265,7 @@ class CommandAddLine : public ServerCommand
 {
  public:
 	CommandAddLine(Module* Creator) : ServerCommand(Creator, "ADDLINE", 6, 6) { }
-	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& parameters) override;
 
 	class Builder : public CmdBuilder
 	{
@@ -278,15 +278,15 @@ class CommandDelLine : public ServerCommand
 {
  public:
 	CommandDelLine(Module* Creator) : ServerCommand(Creator, "DELLINE", 2, 2) { }
-	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& parameters) override;
 };
 
 class CommandEncap : public ServerCommand
 {
  public:
 	CommandEncap(Module* Creator) : ServerCommand(Creator, "ENCAP", 2) { }
-	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& parameters) override;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override;
 };
 
 class CommandIdle : public UserOnlyServerCommand<CommandIdle>
@@ -294,7 +294,7 @@ class CommandIdle : public UserOnlyServerCommand<CommandIdle>
  public:
 	CommandIdle(Module* Creator) : UserOnlyServerCommand<CommandIdle>(Creator, "IDLE", 1) { }
 	CmdResult HandleRemote(RemoteUser* user, Params& parameters);
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_UNICAST(parameters[0]); }
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_UNICAST(parameters[0]); }
 };
 
 class SpanningTree::CommandNick : public UserOnlyServerCommand<SpanningTree::CommandNick>
@@ -308,8 +308,8 @@ class SpanningTree::CommandPing : public ServerCommand
 {
  public:
 	CommandPing(Module* Creator) : ServerCommand(Creator, "PING", 1) { }
-	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_UNICAST(parameters[0]); }
+	CmdResult Handle(User* user, Params& parameters) override;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_UNICAST(parameters[0]); }
 };
 
 class SpanningTree::CommandPong : public ServerOnlyServerCommand<SpanningTree::CommandPong>
@@ -317,7 +317,7 @@ class SpanningTree::CommandPong : public ServerOnlyServerCommand<SpanningTree::C
  public:
 	CommandPong(Module* Creator) : ServerOnlyServerCommand<SpanningTree::CommandPong>(Creator, "PONG", 1) { }
 	CmdResult HandleServer(TreeServer* server, Params& parameters);
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { return ROUTE_UNICAST(parameters[0]); }
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_UNICAST(parameters[0]); }
 };
 
 class CommandSave : public ServerCommand
@@ -328,7 +328,7 @@ class CommandSave : public ServerCommand
 	static const time_t SavedTimestamp = 100;
 
 	CommandSave(Module* Creator) : ServerCommand(Creator, "SAVE", 2) { }
-	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& parameters) override;
 };
 
 class SpanningTree::CommandServer : public ServerOnlyServerCommand<SpanningTree::CommandServer>
@@ -361,7 +361,7 @@ class CommandSNONotice : public ServerCommand
 {
  public:
 	CommandSNONotice(Module* Creator) : ServerCommand(Creator, "SNONOTICE", 2) { }
-	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, Params& parameters) override;
 };
 
 class CommandEndBurst : public ServerOnlyServerCommand<CommandEndBurst>
@@ -389,7 +389,7 @@ class CommandNum : public ServerOnlyServerCommand<CommandNum>
  public:
 	CommandNum(Module* Creator) : ServerOnlyServerCommand<CommandNum>(Creator, "NUM", 3) { }
 	CmdResult HandleServer(TreeServer* server, Params& parameters);
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override;
 
 	class Builder : public CmdBuilder
 	{
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index fa2928687..7ffa4a748 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -96,7 +96,7 @@ class ModuleSpanningTree
 	/** Constructor
 	 */
 	ModuleSpanningTree();
-	void init() CXX11_OVERRIDE;
+	void init() override;
 
 	/** Shows /LINKS
 	 */
@@ -148,36 +148,36 @@ class ModuleSpanningTree
 	 ** *** MODULE EVENTS ***
 	 **/
 
-	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE;
-	void OnPostCommand(Command*, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop) CXX11_OVERRIDE;
-	void OnUserConnect(LocalUser* source) CXX11_OVERRIDE;
-	void OnUserInvite(User* source, User* dest, Channel* channel, time_t timeout, unsigned int notifyrank, CUList& notifyexcepts) CXX11_OVERRIDE;
-	ModResult OnPreTopicChange(User* user, Channel* chan, const std::string& topic) CXX11_OVERRIDE;
-	void OnPostTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE;
-	void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE;
-	void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE;
-	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE;
-	void OnChangeHost(User* user, const std::string &newhost) CXX11_OVERRIDE;
-	void OnChangeRealName(User* user, const std::string& real) CXX11_OVERRIDE;
-	void OnChangeIdent(User* user, const std::string &ident) CXX11_OVERRIDE;
-	void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE;
-	void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) CXX11_OVERRIDE;
-	void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE;
-	void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE;
-	void OnPreRehash(User* user, const std::string &parameter) CXX11_OVERRIDE;
-	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE;
-	void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE;
-	void OnAddLine(User *u, XLine *x) CXX11_OVERRIDE;
-	void OnDelLine(User *u, XLine *x) CXX11_OVERRIDE;
-	ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE;
-	void OnUserAway(User* user) CXX11_OVERRIDE;
-	void OnUserBack(User* user) CXX11_OVERRIDE;
-	void OnLoadModule(Module* mod) CXX11_OVERRIDE;
-	void OnUnloadModule(Module* mod) CXX11_OVERRIDE;
-	ModResult OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE;
-	void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) CXX11_OVERRIDE;
-	CullResult cull() CXX11_OVERRIDE;
+	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override;
+	void OnPostCommand(Command*, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop) override;
+	void OnUserConnect(LocalUser* source) override;
+	void OnUserInvite(User* source, User* dest, Channel* channel, time_t timeout, unsigned int notifyrank, CUList& notifyexcepts) override;
+	ModResult OnPreTopicChange(User* user, Channel* chan, const std::string& topic) override;
+	void OnPostTopicChange(User* user, Channel* chan, const std::string &topic) override;
+	void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) override;
+	void OnBackgroundTimer(time_t curtime) override;
+	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) override;
+	void OnChangeHost(User* user, const std::string &newhost) override;
+	void OnChangeRealName(User* user, const std::string& real) override;
+	void OnChangeIdent(User* user, const std::string &ident) override;
+	void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) override;
+	void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) override;
+	void OnUserPostNick(User* user, const std::string &oldnick) override;
+	void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) override;
+	void OnPreRehash(User* user, const std::string &parameter) override;
+	void ReadConfig(ConfigStatus& status) override;
+	void OnOper(User* user, const std::string &opertype) override;
+	void OnAddLine(User *u, XLine *x) override;
+	void OnDelLine(User *u, XLine *x) override;
+	ModResult OnStats(Stats::Context& stats) override;
+	void OnUserAway(User* user) override;
+	void OnUserBack(User* user) override;
+	void OnLoadModule(Module* mod) override;
+	void OnUnloadModule(Module* mod) override;
+	ModResult OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override;
+	void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) override;
+	CullResult cull() override;
 	~ModuleSpanningTree();
-	Version GetVersion() CXX11_OVERRIDE;
-	void Prioritize() CXX11_OVERRIDE;
+	Version GetVersion() override;
+	void Prioritize() override;
 };
diff --git a/src/modules/m_spanningtree/pingtimer.h b/src/modules/m_spanningtree/pingtimer.h
index 753558689..9529d9b52 100644
--- a/src/modules/m_spanningtree/pingtimer.h
+++ b/src/modules/m_spanningtree/pingtimer.h
@@ -63,7 +63,7 @@ class PingTimer : public Timer
 	 * @param currtime Time now
 	 * @return Always false, we reschedule ourselves instead
 	 */
-	bool Tick(time_t currtime) CXX11_OVERRIDE;
+	bool Tick(time_t currtime) override;
 
  public:
 	/** Construct the timer. This doesn't schedule the timer.
diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h
index 969ed68bf..857ac02a2 100644
--- a/src/modules/m_spanningtree/protocolinterface.h
+++ b/src/modules/m_spanningtree/protocolinterface.h
@@ -28,16 +28,16 @@ class SpanningTreeProtocolInterface : public ProtocolInterface
 
 	 public:
 		Server(TreeSocket* s) : sock(s) { }
-		void SendMetaData(const std::string& key, const std::string& data) CXX11_OVERRIDE;
+		void SendMetaData(const std::string& key, const std::string& data) override;
 	};
 
-	bool SendEncapsulatedData(const std::string& targetmask, const std::string& cmd, const CommandBase::Params& params, User* source) CXX11_OVERRIDE;
-	void BroadcastEncap(const std::string& cmd, const CommandBase::Params& params, User* source, User* omit) CXX11_OVERRIDE;
-	void SendMetaData(User* user, const std::string& key, const std::string& data) CXX11_OVERRIDE;
-	void SendMetaData(Channel* chan, const std::string& key, const std::string& data) CXX11_OVERRIDE;
-	void SendMetaData(const std::string& key, const std::string& data) CXX11_OVERRIDE;
-	void SendSNONotice(char snomask, const std::string& text) CXX11_OVERRIDE;
-	void SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype) CXX11_OVERRIDE;
-	void SendMessage(User* target, const std::string& text, MessageType msgtype) CXX11_OVERRIDE;
-	void GetServerList(ServerList& sl) CXX11_OVERRIDE;
+	bool SendEncapsulatedData(const std::string& targetmask, const std::string& cmd, const CommandBase::Params& params, User* source) override;
+	void BroadcastEncap(const std::string& cmd, const CommandBase::Params& params, User* source, User* omit) override;
+	void SendMetaData(User* user, const std::string& key, const std::string& data) override;
+	void SendMetaData(Channel* chan, const std::string& key, const std::string& data) override;
+	void SendMetaData(const std::string& key, const std::string& data) override;
+	void SendSNONotice(char snomask, const std::string& text) override;
+	void SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype) override;
+	void SendMessage(User* target, const std::string& text, MessageType msgtype) override;
+	void GetServerList(ServerList& sl) override;
 };
diff --git a/src/modules/m_spanningtree/remoteuser.h b/src/modules/m_spanningtree/remoteuser.h
index 416f2f760..c08168b98 100644
--- a/src/modules/m_spanningtree/remoteuser.h
+++ b/src/modules/m_spanningtree/remoteuser.h
@@ -28,5 +28,5 @@ class SpanningTree::RemoteUser : public ::RemoteUser
 {
  public:
 	RemoteUser(const std::string& uid, Server* srv);
-	void WriteRemoteNumeric(const Numeric::Numeric& numeric) CXX11_OVERRIDE;
+	void WriteRemoteNumeric(const Numeric::Numeric& numeric) override;
 };
diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index 782ac86ef..5c765de89 100644
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -37,8 +37,8 @@ class SecurityIPResolver : public DNS::Request
 	DNS::QueryType query;
  public:
 	SecurityIPResolver(Module* me, DNS::Manager* mgr, const std::string& hostname, Link* x, DNS::QueryType qt);
-	void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE;
-	void OnError(const DNS::Query *q) CXX11_OVERRIDE;
+	void OnLookupComplete(const DNS::Query *r) override;
+	void OnError(const DNS::Query *q) override;
 };
 
 /** This class is used to resolve server hostnames during /connect and autoconnect.
@@ -56,6 +56,6 @@ class ServernameResolver : public DNS::Request
 	reference<Autoconnect> myautoconnect;
  public:
 	ServernameResolver(DNS::Manager* mgr, const std::string& hostname, Link* x, DNS::QueryType qt, Autoconnect* myac);
-	void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE;
-	void OnError(const DNS::Query *q) CXX11_OVERRIDE;
+	void OnLookupComplete(const DNS::Query *r) override;
+	void OnError(const DNS::Query *q) override;
 };
diff --git a/src/modules/m_spanningtree/servercommand.h b/src/modules/m_spanningtree/servercommand.h
index 7e4af3b48..ce8a718ab 100644
--- a/src/modules/m_spanningtree/servercommand.h
+++ b/src/modules/m_spanningtree/servercommand.h
@@ -40,10 +40,10 @@ class ServerCommand : public CommandBase
 
 	/** Register this object in the ServerCommandManager
 	 */
-	void RegisterService() CXX11_OVERRIDE;
+	void RegisterService() override;
 
 	virtual CmdResult Handle(User* user, Params& parameters) = 0;
-	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE;
+	RouteDescriptor GetRouting(User* user, const Params& parameters) override;
 
 	/**
 	 * Extract the TS from a string.
@@ -65,7 +65,7 @@ class UserOnlyServerCommand : public ServerCommand
 	UserOnlyServerCommand(Module* Creator, const std::string& Name, unsigned int MinPara = 0, unsigned int MaxPara = 0)
 		: ServerCommand(Creator, Name, MinPara, MaxPara) { }
 
-	CmdResult Handle(User* user, Params& parameters) CXX11_OVERRIDE
+	CmdResult Handle(User* user, Params& parameters) override
 	{
 		RemoteUser* remoteuser = IS_REMOTE(user);
 		if (!remoteuser)
@@ -84,7 +84,7 @@ class ServerOnlyServerCommand : public ServerCommand
 	ServerOnlyServerCommand(Module* Creator, const std::string& Name, unsigned int MinPara = 0, unsigned int MaxPara = 0)
 		: ServerCommand(Creator, Name, MinPara, MaxPara) { }
 
-	CmdResult Handle(User* user, CommandBase::Params& parameters) CXX11_OVERRIDE
+	CmdResult Handle(User* user, CommandBase::Params& parameters) override
 	{
 		if (!IS_SERVER(user))
 			throw ProtocolException("Invalid source");
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 037edd194..506273638 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -228,7 +228,7 @@ class TreeServer : public Server
 	 */
 	void OnPong() { pingtimer.OnPong(); }
 
-	CullResult cull() CXX11_OVERRIDE;
+	CullResult cull() override;
 
 	/** Destructor, deletes ServerUser unless IsRoot()
 	 */
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 6206448c1..4cf75ba1e 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -200,7 +200,7 @@ class TreeSocket : public BufferedSocket
 	 */
 	void CleanNegotiationInfo();
 
-	CullResult cull() CXX11_OVERRIDE;
+	CullResult cull() override;
 	/** Destructor
 	 */
 	~TreeSocket();
@@ -216,11 +216,11 @@ class TreeSocket : public BufferedSocket
 	 * to server docs on the inspircd.org site, the other side
 	 * will then send back its own server string.
 	 */
-	void OnConnected() CXX11_OVERRIDE;
+	void OnConnected() override;
 
 	/** Handle socket error event
 	 */
-	void OnError(BufferedSocketError e) CXX11_OVERRIDE;
+	void OnError(BufferedSocketError e) override;
 
 	/** Sends an error to the remote server, and displays it locally to show
 	 * that it was sent.
@@ -275,7 +275,7 @@ class TreeSocket : public BufferedSocket
 	/** This function is called when we receive data from a remote
 	 * server.
 	 */
-	void OnDataReady() CXX11_OVERRIDE;
+	void OnDataReady() override;
 
 	/** Send one or more complete lines down the socket
 	 */
@@ -308,10 +308,10 @@ class TreeSocket : public BufferedSocket
 
 	/** Handle socket timeout from connect()
 	 */
-	void OnTimeout() CXX11_OVERRIDE;
+	void OnTimeout() override;
 	/** Handle server quit on close
 	 */
-	void Close() CXX11_OVERRIDE;
+	void Close() override;
 
 	/** Fixes messages coming from old servers so the new command handlers understand them
 	 */
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 6fd36438f..af8e4bc8f 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -113,7 +113,7 @@ class SpanningTreeUtilities : public classbase
 
 	/** Prepare for class destruction
 	 */
-	CullResult cull() CXX11_OVERRIDE;
+	CullResult cull() override;
 
 	/** Destroy class and free listeners etc
 	 */