diff options
author | 2025-01-14 12:57:19 +1100 | |
---|---|---|
committer | 2025-01-14 12:57:19 +1100 | |
commit | adee79cf846d836b77c6743a16e1814f69d50f78 (patch) | |
tree | e4f2524e6e7aea13baf06c085ab94cef73f714e0 /src/lib/util/mfpresolve.h | |
parent | b33b81b4d290b5dde93d7d6887b7c8f90183cb00 (diff) |
util/mfpresolve.h: Fix build with MSVC ABI.
All ABI paths must be valid C++ - can't use a static assertion.
Diffstat (limited to 'src/lib/util/mfpresolve.h')
-rw-r--r-- | src/lib/util/mfpresolve.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/util/mfpresolve.h b/src/lib/util/mfpresolve.h index 4b4f62373d3..eee3711ebea 100644 --- a/src/lib/util/mfpresolve.h +++ b/src/lib/util/mfpresolve.h @@ -46,8 +46,8 @@ inline std::pair<std::uintptr_t, std::uintptr_t> resolve_member_function(Ret (T: { if (MAME_ABI_CXX_TYPE == MAME_ABI_CXX_ITANIUM) { - struct { uintptr_t ptr; ptrdiff_t adj; } equiv; - static_assert(sizeof(function) == sizeof(equiv)); + struct { std::uintptr_t ptr; std::ptrdiff_t adj; } equiv; + assert(sizeof(function) == sizeof(equiv)); *reinterpret_cast<decltype(function) *>(&equiv) = function; return detail::resolve_member_function_itanium(equiv.ptr, equiv.adj, object); } @@ -68,7 +68,7 @@ inline std::pair<std::uintptr_t, std::uintptr_t> resolve_member_function(Ret (T: if (MAME_ABI_CXX_TYPE == MAME_ABI_CXX_ITANIUM) { struct { std::uintptr_t ptr; std::ptrdiff_t adj; } equiv; - static_assert(sizeof(function) == sizeof(equiv)); + assert(sizeof(function) == sizeof(equiv)); *reinterpret_cast<decltype(function) *>(&equiv) = function; return detail::resolve_member_function_itanium(equiv.ptr, equiv.adj, object); } |