AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add virtual destructors to Architecture Message Parameters 

Fix function signature
This commit is contained in:
Phillip Stephens 2016-02-20 01:52:16 -08:00
parent ff200677e1
commit cf6c5bf55a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/CArchitectureMessage.hpp
View File

@ -43,6 +43,7 @@ struct CArchMsgParmInt32 : IArchMsgParm
{ {
u32 x4_parm; u32 x4_parm;
CArchMsgParmInt32(u32 parm) : x4_parm(parm) {} CArchMsgParmInt32(u32 parm) : x4_parm(parm) {}
virtual ~CArchMsgParmInt32() {}
}; };
struct CArchMsgParmVoidPtr : IArchMsgParm struct CArchMsgParmVoidPtr : IArchMsgParm
@ -50,6 +51,7 @@ struct CArchMsgParmVoidPtr : IArchMsgParm
void* x4_parm1; void* x4_parm1;
CArchMsgParmVoidPtr(void* parm1) CArchMsgParmVoidPtr(void* parm1)
: x4_parm1(parm1) {} : x4_parm1(parm1) {}
virtual ~CArchMsgParmVoidPtr() {}
}; };
struct CArchMsgParmInt32Int32VoidPtr : IArchMsgParm struct CArchMsgParmInt32Int32VoidPtr : IArchMsgParm
@ -59,22 +61,26 @@ struct CArchMsgParmInt32Int32VoidPtr : IArchMsgParm
void* xc_parm3; void* xc_parm3;
CArchMsgParmInt32Int32VoidPtr(u32 parm1, u32 parm2, void* parm3) CArchMsgParmInt32Int32VoidPtr(u32 parm1, u32 parm2, void* parm3)
: x4_parm1(parm1), x8_parm2(parm2), xc_parm3(parm3) {} : x4_parm1(parm1), x8_parm2(parm2), xc_parm3(parm3) {}
virtual ~CArchMsgParmInt32Int32VoidPtr() {}
}; };
struct CArchMsgParmNull : IArchMsgParm struct CArchMsgParmNull : IArchMsgParm
{ {
virtual ~CArchMsgParmNull() {}
}; };
struct CArchMsgParmReal32 : IArchMsgParm struct CArchMsgParmReal32 : IArchMsgParm
{ {
float x4_parm; float x4_parm;
CArchMsgParmReal32(float parm) : x4_parm(parm) {} CArchMsgParmReal32(float parm) : x4_parm(parm) {}
virtual ~CArchMsgParmReal32() {}
}; };
struct CArchMsgParmUserInput : IArchMsgParm struct CArchMsgParmUserInput : IArchMsgParm
{ {
CFinalInput x4_parm; CFinalInput x4_parm;
CArchMsgParmUserInput(const CFinalInput& parm) : x4_parm(parm) {} CArchMsgParmUserInput(const CFinalInput& parm) : x4_parm(parm) {}
virtual ~CArchMsgParmUserInput() {}
}; };
struct CArchMsgParmControllerStatus : IArchMsgParm struct CArchMsgParmControllerStatus : IArchMsgParm
@ -83,6 +89,8 @@ struct CArchMsgParmControllerStatus : IArchMsgParm
bool x6_parm2; bool x6_parm2;
CArchMsgParmControllerStatus(u16 a, bool b) CArchMsgParmControllerStatus(u16 a, bool b)
: x4_parm1(a), x6_parm2(b) {} : x4_parm1(a), x6_parm2(b) {}
virtual ~CArchMsgParmControllerStatus() {}
}; };
class CArchitectureMessage class CArchitectureMessage

2
Runtime/Input/CInputGenerator.hpp
View File

@ -111,7 +111,7 @@ public:
/* Controller thread */ /* Controller thread */
m_statusChanges[idx].store(EStatusChange::Connected); m_statusChanges[idx].store(EStatusChange::Connected);
} }
void controllerDisconnected(unsigned idx, boo::EDolphinControllerType) void controllerDisconnected(unsigned idx)
{ {
/* Controller thread */ /* Controller thread */
std::unique_lock<std::mutex> lk(m_stateLock); std::unique_lock<std::mutex> lk(m_stateLock);