From 28f66efe307150558f4ad2546e058370a828be3e Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Fri, 5 Sep 2014 15:56:31 +0100
Subject: Revert "Temporarily commented out override directives."

This reverts commit 6db727c60c01264dc9a9c209c5b335da8f53cd64.

Conflicts:
	src/Bindings/PluginLua.h
	src/Blocks/BlockFire.h
	src/Generating/ChunkGenerator.h
	src/LoggerListeners.cpp
	src/Mobs/Components/AIAggressiveComponent.h
	src/Mobs/Monster.h
	src/OSSupport/IsThread.h
	src/Protocol/Authenticator.h
	src/UI/SlotArea.h
---
 src/Entities/EntityEffect.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/Entities/EntityEffect.h')

diff --git a/src/Entities/EntityEffect.h b/src/Entities/EntityEffect.h
index 4ce155f4a..47c298f57 100644
--- a/src/Entities/EntityEffect.h
+++ b/src/Entities/EntityEffect.h
@@ -213,7 +213,7 @@ public:
 	{
 	}
 	
-	virtual void OnActivate(cPawn & a_Target) /*override*/;
+	virtual void OnActivate(cPawn & a_Target) override;
 };
 
 
@@ -230,7 +230,7 @@ public:
 	{
 	}
 	
-	virtual void OnActivate(cPawn & a_Target) /*override*/;
+	virtual void OnActivate(cPawn & a_Target) override;
 };
 
 
@@ -277,7 +277,7 @@ public:
 	{
 	}
 	
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
@@ -384,8 +384,8 @@ public:
 	{
 	}
 	
-	// cEntityEffect /*override*/s:
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	// cEntityEffect overrides:
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
@@ -402,8 +402,8 @@ public:
 	{
 	}
 	
-	// cEntityEffect /*override*/s:
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	// cEntityEffect overrides:
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
@@ -420,8 +420,8 @@ public:
 	{
 	}
 	
-	// cEntityEffect /*override*/s:
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	// cEntityEffect overrides:
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
@@ -438,8 +438,8 @@ public:
 	{
 	}
 	
-	// cEntityEffect /*override*/s:
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	// cEntityEffect overrides:
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
@@ -486,7 +486,7 @@ public:
 	{
 	}
 	
-	virtual void OnTick(cPawn & a_Target) /*override*/;
+	virtual void OnTick(cPawn & a_Target) override;
 };
 
 
-- 
cgit v1.2.3