From 28f66efe307150558f4ad2546e058370a828be3e Mon Sep 17 00:00:00 2001 From: Tycho 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/Globals.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Globals.h') diff --git a/src/Globals.h b/src/Globals.h index 80afff80a..de1024010 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -10,7 +10,7 @@ // Compiler-dependent stuff: #if defined(_MSC_VER) - // MSVC produces warning C4481 on the /*override*/ keyword usage, so disable the warning altogether + // MSVC produces warning C4481 on the override keyword usage, so disable the warning altogether #pragma warning(disable:4481) // Disable some warnings that we don't care about: @@ -56,9 +56,9 @@ // TODO: Can GCC explicitly mark classes as abstract (no instances can be created)? #define abstract - // /*override*/ is part of c++11 + // override is part of c++11 #if __cplusplus < 201103L - #define /*override*/ + #define override #endif #define OBSOLETE __attribute__((deprecated)) @@ -103,7 +103,7 @@ #define abstract // Mark virtual methods as overriding (forcing them to have a virtual function of the same signature in the base class) - #define /*override*/ + #define override // Mark functions as obsolete, so that their usage results in a compile-time warning #define OBSOLETE -- cgit v1.2.3