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.

---
 include/modules/cap.h   | 8 ++++----
 include/modules/dns.h   | 2 +-
 include/modules/ircv3.h | 6 +++---
 include/modules/shun.h  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'include/modules')

diff --git a/include/modules/cap.h b/include/modules/cap.h
index 6dcb9f3bc..658aefe5c 100644
--- a/include/modules/cap.h
+++ b/include/modules/cap.h
@@ -32,8 +32,8 @@ namespace Cap
 	{
 	 public:
 		ExtItem(Module* mod);
-		std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
-		void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
+		std::string serialize(SerializeFormat format, const Extensible* container, void* item) const override;
+		void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override;
 	};
 
 	class Capability;
@@ -134,7 +134,7 @@ namespace Cap
 		 */
 		dynamic_reference<Manager> manager;
 
-		void OnCapture() CXX11_OVERRIDE
+		void OnCapture() override
 		{
 			if (active)
 				SetActive(true);
@@ -181,7 +181,7 @@ namespace Cap
 			SetActive(false);
 		}
 
-		void RegisterService() CXX11_OVERRIDE
+		void RegisterService() override
 		{
 			manager.SetCaptureHook(this);
 			SetActive(true);
diff --git a/include/modules/dns.h b/include/modules/dns.h
index 3db651798..9f58acce4 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -191,7 +191,7 @@ namespace DNS
 		/** Used to time out the query, calls OnError and asks the TimerManager
 		 * to delete this request
 		 */
-		bool Tick(time_t now) CXX11_OVERRIDE
+		bool Tick(time_t now) override
 		{
 			Query rr(this->question);
 			rr.error = ERROR_TIMEDOUT;
diff --git a/include/modules/ircv3.h b/include/modules/ircv3.h
index 338abdeba..5ca12eec6 100644
--- a/include/modules/ircv3.h
+++ b/include/modules/ircv3.h
@@ -33,7 +33,7 @@ class IRCv3::WriteNeighborsWithCap : public User::ForEachNeighborHandler
 	const Cap::Capability& cap;
 	ClientProtocol::Event& protoev;
 
-	void Execute(LocalUser* user) CXX11_OVERRIDE
+	void Execute(LocalUser* user) override
 	{
 		if (cap.get(user))
 			user->Send(protoev);
@@ -70,12 +70,12 @@ class IRCv3::CapTag : public ClientProtocol::MessageTagProvider
 	Cap::Capability cap;
 	const std::string tagname;
 
-	bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) CXX11_OVERRIDE
+	bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) override
 	{
 		return cap.get(user);
 	}
 
-	void OnClientProtocolPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
+	void OnClientProtocolPopulateTags(ClientProtocol::Message& msg) override
 	{
 		T& tag = static_cast<T&>(*this);
 		const std::string* const val = tag.GetValue(msg);
diff --git a/include/modules/shun.h b/include/modules/shun.h
index 1c35e3a74..e2308134e 100644
--- a/include/modules/shun.h
+++ b/include/modules/shun.h
@@ -39,7 +39,7 @@ class Shun : public XLine
 	{
 	}
 
-	bool Matches(User* u) CXX11_OVERRIDE
+	bool Matches(User* u) override
 	{
 		LocalUser* lu = IS_LOCAL(u);
 		if (lu && lu->exempt)
@@ -54,12 +54,12 @@ class Shun : public XLine
 		return false;
 	}
 
-	bool Matches(const std::string& str) CXX11_OVERRIDE
+	bool Matches(const std::string& str) override
 	{
 		return (matchtext == str);
 	}
 
-	const std::string& Displayable() CXX11_OVERRIDE
+	const std::string& Displayable() override
 	{
 		return matchtext;
 	}
-- 
cgit v1.3.1-10-gc9f91