From b4c9b347f82391ef612d1bda2c7dd0a878d2ec0f Mon Sep 17 00:00:00 2001 From: arbee Date: Sat, 29 Apr 2023 22:03:11 -0400 Subject: concept/concept.cpp: Fix collision with "concept" reserved word in C++20 warned by GCC 13. [R. Belmont] --- src/mame/concept/concept.cpp | 8 ++++---- src/mame/concept/concept.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mame/concept/concept.cpp b/src/mame/concept/concept.cpp index f907ff0810a..eeb793cd8e9 100644 --- a/src/mame/concept/concept.cpp +++ b/src/mame/concept/concept.cpp @@ -62,7 +62,7 @@ void concept_state::concept_memmap(address_map &map) } -static INPUT_PORTS_START( concept ) +static INPUT_PORTS_START( corvus_concept ) PORT_START("KEY0") /* port 0: keys 0x00 through 0x0f */ PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("(right)") PORT_CODE(KEYCODE_RIGHT) @@ -213,7 +213,7 @@ void concept_a2_cards(device_slot_interface &device) } -void concept_state::concept(machine_config &config) +void concept_state::corvus_concept(machine_config &config) { /* basic machine hardware */ M68000(config, m_maincpu, 16.364_MHz_XTAL / 2); @@ -320,5 +320,5 @@ ROM_START( concept ) ROM_LOAD16_BYTE( "mb20l.bin", 0x000001, 0x001000, CRC(b4b59de9) SHA1(3e8b8b5950b5359203c054f94af1fc5b8f0495b9) ) ROM_END -/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ -COMP( 1982, concept, 0, 0, concept, concept, concept_state, empty_init, "Corvus Systems", "Concept" , 0 ) +/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ +COMP( 1982, concept, 0, 0, corvus_concept, corvus_concept, concept_state, empty_init, "Corvus Systems", "Concept" , 0 ) diff --git a/src/mame/concept/concept.h b/src/mame/concept/concept.h index a23645661da..74704d20f26 100644 --- a/src/mame/concept/concept.h +++ b/src/mame/concept/concept.h @@ -41,7 +41,7 @@ public: m_videoram(*this,"videoram") { } - void concept(machine_config &config); + void corvus_concept(machine_config &config); private: required_device m_maincpu; -- cgit v1.2.3