From c70ed529c2d98fd838794874bdc97c805681ed63 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 14 May 2026 03:15:16 +1000 Subject: Turn off the sfinae-incomplete warning for GCC 16. --- scripts/genie.lua | 19 ++++++++----------- src/mame/dynax/ddenlovr.cpp | 8 +++++++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index 67069c1dc97..09b2ea73dba 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1020,12 +1020,8 @@ end "-Wno-unknown-warning-option", "-Wno-unused-value", "-Wno-unused-const-variable", + "-Wno-xor-used-as-pow", -- clang 10.0 complains that expressions like 10 ^ 7 look like exponention } - if ((version >= 100000) and (_OPTIONS["targetos"] ~= 'macosx')) or (version >= 120000) then - buildoptions { - "-Wno-xor-used-as-pow", -- clang 10.0 complains that expressions like 10 ^ 7 look like exponention - } - end if version >= 140000 then buildoptions { "-Wno-bitwise-instead-of-logical", -- clang 14.0 complains about &, | on bools in asmjit @@ -1049,13 +1045,9 @@ end "-Wno-error=attributes", -- GCC fails to recognize some uses of [[maybe_unused]] "-Wno-error=stringop-truncation", -- ImGui again "-Wno-stringop-overflow", -- generates false positives when assigning an int rvalue to a u8 variable without an explicit cast + "-Wno-stringop-overread", -- machine/bbc.cpp in GCC 11.1 + "-Wno-nonnull", -- luaengine.cpp lambdas do not need "this" captured but GCC 11.1 erroneously insists } - if version >= 110000 then - buildoptions { - "-Wno-nonnull", -- luaengine.cpp lambdas do not need "this" captured but GCC 11.1 erroneously insists - "-Wno-stringop-overread", -- machine/bbc.cpp in GCC 11.1 - } - end if version >= 120000 then buildoptions { "-Wno-error=maybe-uninitialized", @@ -1067,6 +1059,11 @@ end "-Wno-xor-used-as-pow", } end + if version >= 160000 then + buildoptions_cpp { + "-Wno-sfinae-incomplete", + } + end end end diff --git a/src/mame/dynax/ddenlovr.cpp b/src/mame/dynax/ddenlovr.cpp index b8c94a3bbc7..15066e1470c 100644 --- a/src/mame/dynax/ddenlovr.cpp +++ b/src/mame/dynax/ddenlovr.cpp @@ -7322,13 +7322,19 @@ INPUT_PORTS_END static INPUT_PORTS_START( mjmyster ) - // The manual provides three sets of standard settings: + // The Mahjong the Mysterious World manual provides three sets of standard settings: // 標準設定 シングル向け 標準設定 メダルコーナー向け 標準設定 アミューズコーナー向け // SW 1 Off Off Off On On On Off On On Off Off Off Off On On On Off On On Off On Off Off On Off Off On Off On Off // SW 2 Off Off Off Off On On Off On On Off Off Off Off Off Off Off On On On Off Off Off Off Off Off Off Off Off Off Off // SW 3 Off Off Off On On On On On On On Off Off Off On On On On On On Off Off On Off On On On On On On Off // SW 4 Off On On On On Off Off Off Off Off On On On On On Off Off Off Off Off On On On On On Off Off Off Off Off + // The Mahjong the Mysterious Universe manual provides two sets of standard settings, but unfortunately the Chinese text in the scans is illegible: + // SW 1 Off Off Off On On On Off On On Off On Off Off On Off Off On Off On Off + // SW 2 Off Off Off Off On On Off On On Off Off Off Off Off Off Off Off Off Off Off + // SW 3 Off Off Off On On On On On On Off Off On Off On On On On On On Off + // SW 4 Off On On On On Off Off On On Off On On On On On Off Off On On Off + PORT_START("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) PORT_CONDITION("DSW3", 0x03, EQUALS, 0x02) // pay PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) PORT_CONDITION("DSW3", 0x03, EQUALS, 0x03) -- cgit v1.2.3