Replace _IRR_OVERRIDE_ macro with override keyword

The commit also establishes a precedent of leaving off the `virtual`
keyword in overrides. Although not strictly necessary, I believe this is
good for readability because it makes it clear it is an override and not
a pure virtual function, and it helps keep line lengths shorter. We
should move towards eliminating the macro altogether, but the definition
has been left in with a note on deprecation so that in-progress work
will not suffer merge conflicts.

1 files changed, 2 insertions, 5 deletions

diff --git a/include/irrTypes.h b/include/irrTypes.h
index f73e0a9..e67b395 100644
--- a/include/irrTypes.h
+++ b/include/irrTypes.h
@@ -112,13 +112,10 @@ For functions:		template<class T> _IRR_DEPRECATED_ void test4(void) {}
 #define _IRR_DEPRECATED_

 #endif

 

-//! Defines an override macro, to protect virtual functions from typos and other mismatches

-/** Usage in a derived class:

-virtual void somefunc() _IRR_OVERRIDE_;

-*/

+//! deprecated macro for virtual function override

+/** prefer to use the override keyword for new code */

 #define _IRR_OVERRIDE_ override

 

-

 //! creates four CC codes used in Irrlicht for simple ids

 /** some compilers can create those by directly writing the

 code like 'code', but some generate warnings so we use this macro here */