From 34040b694c7a50f5db9e9d05a7f9b2445399ae6a Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Thu, 8 Sep 2016 19:47:59 +0100
Subject: [PATCH] Make use of override unconditional.

---
 src/stdafx.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/stdafx.h b/src/stdafx.h
index 52df55d62e..6468346fa6 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -512,15 +512,9 @@ static inline void free(const void *ptr)
 #endif
 
 /*
- * Conditional define for the override keyword.
- * Use of the override keyword can prevent various types of problems when the base method signature is changed, but derived overriding methods are not
- * This is conditional to maintain compatibility with legacy compilers
+ * Define for the override keyword.
  */
-#if !defined(DISABLE_OVERRIDE) && (__cplusplus >= 201103L || defined(__STDCXX_VERSION__) || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__))
-	#define OVERRIDE override
-#else
-	#define OVERRIDE
-#endif
+#define OVERRIDE override
 
 /**
  * Using _mm_prefetch() with gcc implies the compile flag -msse.