Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 15:11:37 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

delegate: Fix Visual Studio case with displaced object base (internal representation seems to have drifted since it was originally written).

Browse Source
This commit is contained in:
Aaron Giles 2021-07-14 19:03:09 -07:00
parent 59af1cd3f1
commit 66554d3b84
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/util/delegate.h
View File

@ -350,7 +350,7 @@ public:
// copy constructor
delegate_mfp(const delegate_mfp &src)
: m_function(src.m_function), m_this_delta(0), m_dummy1(0), m_dummy2(0), m_size(0)
: m_function(src.m_function), m_this_delta(src.m_this_delta), m_dummy1(src.m_dummy1), m_dummy2(src.m_dummy2), m_size(src.m_size)
{
}
@ -358,7 +358,7 @@ public:
template <typename MemberFunctionType, class MemberFunctionClass, typename ReturnType, typename StaticFunctionType>
delegate_mfp(MemberFunctionType mfp, MemberFunctionClass *, ReturnType *, StaticFunctionType)
{
//assert(sizeof(mfp) == 12 || sizeof(mfp) == 16);
static_assert(sizeof(mfp) == sizeof(void *) || sizeof(mfp) == 2 * sizeof(void *));
m_size = sizeof(mfp);
*reinterpret_cast<MemberFunctionType *>(this) = mfp;
}
@ -375,7 +375,7 @@ public:
void update_after_bind(FunctionType &funcptr, delegate_generic_class *&object)
{
funcptr = reinterpret_cast<FunctionType>(m_function);
if (m_size == SINGLE_MEMFUNCPTR_SIZE + sizeof(int))
if (m_size > SINGLE_MEMFUNCPTR_SIZE)
object = reinterpret_cast<delegate_generic_class *>(reinterpret_cast<std::uint8_t *>(object) + m_this_delta);
}