From adee79cf846d836b77c6743a16e1814f69d50f78 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 14 Jan 2025 12:57:19 +1100 Subject: util/mfpresolve.h: Fix build with MSVC ABI. All ABI paths must be valid C++ - can't use a static assertion. --- src/lib/util/mfpresolve.h | 6 +++--- 1 file 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 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(&equiv) = function; return detail::resolve_member_function_itanium(equiv.ptr, equiv.adj, object); } @@ -68,7 +68,7 @@ inline std::pair 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(&equiv) = function; return detail::resolve_member_function_itanium(equiv.ptr, equiv.adj, object); } -- cgit v1.2.3