diff options
author | 2021-07-14 19:03:09 -0700 | |
---|---|---|
committer | 2021-07-14 19:03:09 -0700 | |
commit | 66554d3b84f5fec60dcf5d896283a1a04487c0e0 (patch) | |
tree | b270ff152d24a7ce5ec10984d615ac5c31a2cf01 /src | |
parent | 59af1cd3f19c530656b0b25ed9eb93aebdb96b7f (diff) |
delegate: Fix Visual Studio case with displaced object base (internal representation seems to have drifted since it was originally written).
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/util/delegate.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/util/delegate.h b/src/lib/util/delegate.h index 39cc5eb3d00..454045ba98e 100644 --- a/src/lib/util/delegate.h +++ b/src/lib/util/delegate.h @@ -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); } |