From b5c1237f93aa12eb327a26ece196b8e521bd6b60 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 12 Aug 2023 09:31:33 +0200 Subject: [PATCH] - removed NOVTABLE #define. This was used on just two small base classes, the overall savings are zero. --- src/common/engine/m_joy.h | 2 +- src/common/platform/win32/i_input.h | 2 +- src/common/utility/basics.h | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/common/engine/m_joy.h b/src/common/engine/m_joy.h index 650e32506..088d5bd6d 100644 --- a/src/common/engine/m_joy.h +++ b/src/common/engine/m_joy.h @@ -18,7 +18,7 @@ enum EJoyAxis }; // Generic configuration interface for a controller. -struct NOVTABLE IJoystickConfig +struct IJoystickConfig { virtual ~IJoystickConfig() = 0; diff --git a/src/common/platform/win32/i_input.h b/src/common/platform/win32/i_input.h index 643cc65b3..16a276ce8 100644 --- a/src/common/platform/win32/i_input.h +++ b/src/common/platform/win32/i_input.h @@ -115,7 +115,7 @@ protected: void PostKeyEvent(int keynum, INTBOOL down, bool foreground); }; -class NOVTABLE FJoystickCollection : public FInputDevice +class FJoystickCollection : public FInputDevice { public: virtual void AddAxes(float axes[NUM_JOYAXIS]) = 0; diff --git a/src/common/utility/basics.h b/src/common/utility/basics.h index 6655ede2c..2429e3cf2 100644 --- a/src/common/utility/basics.h +++ b/src/common/utility/basics.h @@ -69,12 +69,6 @@ using INTBOOL = int; using BITFIELD = uint32_t; -#if defined(_MSC_VER) -#define NOVTABLE __declspec(novtable) -#else -#define NOVTABLE -#endif - // always use our own definition for consistency. #ifdef M_PI #undef M_PI