From efdb9a072f84e1da7ff40f15fbdb13e20b808480 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 26 Sep 2021 15:26:25 +1000 Subject: Actually stage the fix to validity.cpp, clean up video/kikikai.cpp a little, srcclean latest PRs. --- src/emu/validity.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/emu/validity.cpp') diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp index 3ead00ec99f..ca3389cde41 100644 --- a/src/emu/validity.cpp +++ b/src/emu/validity.cpp @@ -1410,7 +1410,7 @@ void validate_delegates_mfp() osd_printf_error("Error testing delegate this pointer adjustment for incomplete class %p -> %p (expected %p)\n", static_cast(&d), addr, static_cast(static_cast(&d))); // test MSVC extension allowing casting member pointer types across virtual inheritance relationships -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) cb1 = make_diamond_class_delegate(&diamond_inheritance::get_base, &d); addr = nullptr; -- cgit v1.2.3