From cf6c5bf55acb6612a54eaf4a903ea0e978b52155 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sat, 20 Feb 2016 01:52:16 -0800 Subject: [PATCH] Add virtual destructors to Architecture Message Parameters Fix function signature --- Runtime/CArchitectureMessage.hpp | 8 ++++++++ Runtime/Input/CInputGenerator.hpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Runtime/CArchitectureMessage.hpp b/Runtime/CArchitectureMessage.hpp index ad3735290..e2668e295 100644 --- a/Runtime/CArchitectureMessage.hpp +++ b/Runtime/CArchitectureMessage.hpp @@ -43,6 +43,7 @@ struct CArchMsgParmInt32 : IArchMsgParm { u32 x4_parm; CArchMsgParmInt32(u32 parm) : x4_parm(parm) {} + virtual ~CArchMsgParmInt32() {} }; struct CArchMsgParmVoidPtr : IArchMsgParm @@ -50,6 +51,7 @@ struct CArchMsgParmVoidPtr : IArchMsgParm void* x4_parm1; CArchMsgParmVoidPtr(void* parm1) : x4_parm1(parm1) {} + virtual ~CArchMsgParmVoidPtr() {} }; struct CArchMsgParmInt32Int32VoidPtr : IArchMsgParm @@ -59,22 +61,26 @@ struct CArchMsgParmInt32Int32VoidPtr : IArchMsgParm void* xc_parm3; CArchMsgParmInt32Int32VoidPtr(u32 parm1, u32 parm2, void* parm3) : x4_parm1(parm1), x8_parm2(parm2), xc_parm3(parm3) {} + virtual ~CArchMsgParmInt32Int32VoidPtr() {} }; struct CArchMsgParmNull : IArchMsgParm { + virtual ~CArchMsgParmNull() {} }; struct CArchMsgParmReal32 : IArchMsgParm { float x4_parm; CArchMsgParmReal32(float parm) : x4_parm(parm) {} + virtual ~CArchMsgParmReal32() {} }; struct CArchMsgParmUserInput : IArchMsgParm { CFinalInput x4_parm; CArchMsgParmUserInput(const CFinalInput& parm) : x4_parm(parm) {} + virtual ~CArchMsgParmUserInput() {} }; struct CArchMsgParmControllerStatus : IArchMsgParm @@ -83,6 +89,8 @@ struct CArchMsgParmControllerStatus : IArchMsgParm bool x6_parm2; CArchMsgParmControllerStatus(u16 a, bool b) : x4_parm1(a), x6_parm2(b) {} + + virtual ~CArchMsgParmControllerStatus() {} }; class CArchitectureMessage diff --git a/Runtime/Input/CInputGenerator.hpp b/Runtime/Input/CInputGenerator.hpp index 6d3b4dfec..8fe435c04 100644 --- a/Runtime/Input/CInputGenerator.hpp +++ b/Runtime/Input/CInputGenerator.hpp @@ -111,7 +111,7 @@ public: /* Controller thread */ m_statusChanges[idx].store(EStatusChange::Connected); } - void controllerDisconnected(unsigned idx, boo::EDolphinControllerType) + void controllerDisconnected(unsigned idx) { /* Controller thread */ std::unique_lock lk(m_stateLock);