From c78ecdf579c0bf0a75ed0f9641ffef8d89c17ec8 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 25 Jan 2019 02:52:11 +0000
Subject: Replace the override macro with the override keyword.

---
 src/modules/m_flashpolicyd.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/modules/m_flashpolicyd.cpp')

diff --git a/src/modules/m_flashpolicyd.cpp b/src/modules/m_flashpolicyd.cpp
index db0eeb1f1..c745552a6 100644
--- a/src/modules/m_flashpolicyd.cpp
+++ b/src/modules/m_flashpolicyd.cpp
@@ -34,7 +34,7 @@ class FlashPDSocket : public BufferedSocket, public Timer, public insp::intrusiv
 	 */
 	bool waitingcull;
 
-	bool Tick(time_t currtime) CXX11_OVERRIDE
+	bool Tick(time_t currtime) override
 	{
 		AddToCull();
 		return false;
@@ -54,12 +54,12 @@ class FlashPDSocket : public BufferedSocket, public Timer, public insp::intrusiv
 		sockets.erase(this);
 	}
 
-	void OnError(BufferedSocketError) CXX11_OVERRIDE
+	void OnError(BufferedSocketError) override
 	{
 		AddToCull();
 	}
 
-	void OnDataReady() CXX11_OVERRIDE
+	void OnDataReady() override
 	{
 		if (recvq == expected_request)
 			WriteData(policy_reply);
@@ -82,7 +82,7 @@ class ModuleFlashPD : public Module
 	unsigned int timeout;
 
  public:
-	ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
+	ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override
 	{
 		if (!stdalgo::string::equalsci(from->bind_tag->getString("type"), "flashpolicyd"))
 			return MOD_RES_PASSTHRU;
@@ -94,7 +94,7 @@ class ModuleFlashPD : public Module
 		return MOD_RES_ALLOW;
 	}
 
-	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) override
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("flashpolicyd");
 		std::string file = tag->getString("file");
@@ -143,7 +143,7 @@ class ModuleFlashPD : public Module
 		timeout = tag->getDuration("timeout", 5, 1);
 	}
 
-	CullResult cull() CXX11_OVERRIDE
+	CullResult cull() override
 	{
 		for (insp::intrusive_list<FlashPDSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ++i)
 		{
@@ -153,7 +153,7 @@ class ModuleFlashPD : public Module
 		return Module::cull();
 	}
 
-	Version GetVersion() CXX11_OVERRIDE
+	Version GetVersion() override
 	{
 		return Version("Flash Policy Daemon. Allows Flash IRC clients to connect", VF_VENDOR);
 	}
-- 
cgit v1.3.1-10-gc9f91