From 695d526764206b4a37ddb84ce0937314eb781422 Mon Sep 17 00:00:00 2001 From: Lars Mueller Date: Fri, 4 Apr 2025 16:32:52 +0200 Subject: [PATCH] Get rid of `_IRR_OVERRIDE_` macro --- irr/include/irrTypes.h | 4 ---- irr/src/CIrrDeviceSDL.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/irr/include/irrTypes.h b/irr/include/irrTypes.h index 9e71d0771..9018dd151 100644 --- a/irr/include/irrTypes.h +++ b/irr/include/irrTypes.h @@ -66,10 +66,6 @@ typedef char fschar_t; } // end namespace irr -//! deprecated macro for virtual function override -/** prefer to use the override keyword for new code */ -#define _IRR_OVERRIDE_ override - // Invokes undefined behavior for unreachable code optimization // Note: an assert(false) is included first to catch this in debug builds #if defined(__cpp_lib_unreachable) diff --git a/irr/src/CIrrDeviceSDL.h b/irr/src/CIrrDeviceSDL.h index 33d97ce56..1faaad7a7 100644 --- a/irr/src/CIrrDeviceSDL.h +++ b/irr/src/CIrrDeviceSDL.h @@ -206,7 +206,7 @@ public: { } - virtual void setRelativeMode(bool relative) _IRR_OVERRIDE_ + virtual void setRelativeMode(bool relative) override { // Only change it when necessary, as it flushes mouse motion when enabled if (relative != static_cast(SDL_GetRelativeMouseMode())) {