xrPhysics: correct implementation of pure virtual destructor

OpenXRay · Dec 17, 2020 · e67ff4f · e67ff4f
1 parent 6b32611
commit e67ff4f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 30 deletions.
diff --git a/src/xrPhysics/IClimableObject.h b/src/xrPhysics/IClimableObject.h
@@ -39,9 +39,7 @@ class IClimableObject
     virtual IPhysicsShellHolder* cast_IPhysicsShellHolder() = 0;
 
 protected:
-#if defined(XR_PLATFORM_WINDOWS)
-    virtual ~IClimableObject() = 0 {}
-#elif defined(XR_PLATFORM_LINUX)
-    virtual ~IClimableObject() {}
-#endif
+    virtual ~IClimableObject() = 0;
 };
+
+inline IClimableObject::~IClimableObject() = default;
diff --git a/src/xrPhysics/IColisiondamageInfo.h b/src/xrPhysics/IColisiondamageInfo.h
@@ -18,9 +18,7 @@ class ICollisionDamageInfo
     virtual bool GetAndResetInitiated() = 0;
 
 protected:
-#if defined(XR_PLATFORM_WINDOWS)
-    virtual ~ICollisionDamageInfo() = 0 {}
-#elif defined(XR_PLATFORM_LINUX)
-    virtual ~ICollisionDamageInfo() {}
-#endif
+    virtual ~ICollisionDamageInfo() = 0;
 };
+
+inline ICollisionDamageInfo::~ICollisionDamageInfo() = default;
diff --git a/src/xrPhysics/IElevatorState.h b/src/xrPhysics/IElevatorState.h
@@ -19,9 +19,7 @@ class IElevatorState
     virtual void NetRelcase(IPhysicsShellHolder* O) = 0;
 
 protected:
-#if defined(XR_PLATFORM_WINDOWS)
-    virtual ~IElevatorState() = 0 {}
-#elif defined(XR_PLATFORM_LINUX)
-    virtual ~IElevatorState() {}
-#endif
+    virtual ~IElevatorState() = 0;
 };
+
+inline IElevatorState::~IElevatorState() = default;
diff --git a/src/xrPhysics/IPHCapture.h b/src/xrPhysics/IPHCapture.h
@@ -8,12 +8,12 @@ class IPHCapture
     virtual void Release() = 0;
 
 protected:
-#if defined(XR_PLATFORM_WINDOWS)
-    virtual ~IPHCapture() = 0 {}
-#elif defined(XR_PLATFORM_LINUX)
-    virtual ~IPHCapture() {}
-#endif
+    virtual ~IPHCapture() = 0;
 };
+
+inline IPHCapture::~IPHCapture() = default;
+
+
 class CPHCharacter;
 struct NearestToPointCallback;
 XRPHYSICS_API IPHCapture* phcapture_create(

diff --git a/src/xrPhysics/IPHStaticGeomShell.h b/src/xrPhysics/IPHStaticGeomShell.h
@@ -1,17 +1,16 @@
 #pragma once
 #include "PhysicsExternalCommon.h"
+
 class IPHStaticGeomShell
 {
 protected:
-#if defined(XR_PLATFORM_WINDOWS)
-    virtual ~IPHStaticGeomShell() = 0 {}
-#elif defined(XR_PLATFORM_LINUX)
-    virtual ~IPHStaticGeomShell() {}
-#endif
+    virtual ~IPHStaticGeomShell() = 0;
 
     //	virtual void						set_ObjectContactCallback	(ObjectContactCallbackFun* callback);
 };
 
+inline IPHStaticGeomShell::~IPHStaticGeomShell() = default;
+
 class IPhysicsShellHolder;
 class IClimableObject;
 XRPHYSICS_API IPHStaticGeomShell* P_BuildStaticGeomShell(

diff --git a/src/xrPhysics/icollisiondamagereceiver.h b/src/xrPhysics/icollisiondamagereceiver.h
@@ -13,13 +13,11 @@ class ICollisionDamageReceiver
     virtual void CollisionHit(u16 source_id, u16 bone_id, float power, const Fvector& dir, Fvector& pos) = 0;
 
 protected:
-#if defined(XR_PLATFORM_WINDOWS)
-    virtual ~ICollisionDamageReceiver() = 0 {}
-#elif defined(XR_PLATFORM_LINUX)
-    virtual ~ICollisionDamageReceiver() {}
-#endif
+    virtual ~ICollisionDamageReceiver() = 0;
 };
 
+inline ICollisionDamageReceiver::~ICollisionDamageReceiver() = default;
+
 struct dContact;
 struct SGameMtl;
 XRPHYSICS_API void DamageReceiverCollisionCallback(