diff options
| author | 2021-09-26 15:26:25 +1000 | |
|---|---|---|
| committer | 2021-09-26 15:26:25 +1000 | |
| commit | efdb9a072f84e1da7ff40f15fbdb13e20b808480 (patch) | |
| tree | 096b5c47de044cd6b64a94897ef00d77107b17f9 /src/emu/validity.cpp | |
| parent | 12c30453d357bf34a664c74794a083090d56f2a8 (diff) | |
Actually stage the fix to validity.cpp, clean up video/kikikai.cpp a little, srcclean latest PRs.
Diffstat (limited to 'src/emu/validity.cpp')
| -rw-r--r-- | src/emu/validity.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<void const *>(&d), addr, static_cast<void const *>(static_cast<virtual_derived_b *>(&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; |
