Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 16:50:57 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Avoid multiple explicit instantiations definition of templates

Browse Source 
According to the C++ standard 14.7 clause 5, "an explicit
instantiation definition shall appear at most once in a program".

Move the instantiation from the individual implementation files
to the interface implementation file.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
This commit is contained in:
Stefan Brüns 2018-06-29 18:25:56 +02:00
parent a9f194398a
commit e6712208ea
12 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/bus/coco/coco_dcmodem.cpp
View File

@ -101,8 +101,6 @@ ROM_START(coco_dcmodem)
ROM_END
DEFINE_DEVICE_TYPE_PRIVATE(COCO_DCMODEM, device_cococart_interface, coco_dc_modem_device, "coco_dcmodem", "CoCo Direct Connect Modem PAK")
template class device_finder<device_cococart_interface, false>;
template class device_finder<device_cococart_interface, true>;
//-------------------------------------------------

2
src/devices/bus/coco/coco_gmc.cpp
View File

@ -63,8 +63,6 @@ MACHINE_CONFIG_END
//**************************************************************************
DEFINE_DEVICE_TYPE_PRIVATE(COCO_PAK_GMC, device_cococart_interface, coco_pak_gmc_device, "cocopakgmc", "CoCo Games Master Cartridge")
template class device_finder<device_cococart_interface, false>;
template class device_finder<device_cococart_interface, true>;
//-------------------------------------------------
// coco_pak_device - constructor

2
src/devices/bus/coco/coco_multi.cpp
View File

@ -214,8 +214,6 @@ INPUT_PORTS_END
//**************************************************************************
DEFINE_DEVICE_TYPE_PRIVATE(COCO_MULTIPAK, device_cococart_interface, coco_multipak_device, "coco_multipack", "CoCo Multi-Pak Interface")
template class device_finder<device_cococart_interface, false>;
template class device_finder<device_cococart_interface, true>;

2
src/devices/bus/coco/coco_orch90.cpp
View File

@ -123,5 +123,3 @@ MACHINE_CONFIG_END
//**************************************************************************
DEFINE_DEVICE_TYPE_PRIVATE(COCO_ORCH90, device_cococart_interface, coco_orch90_device, "coco_orch90", "CoCo Orch-90 PAK")
template class device_finder<device_cococart_interface, false>;
template class device_finder<device_cococart_interface, true>;

2
src/devices/bus/coco/coco_rs232.cpp
View File

@ -112,5 +112,3 @@ const tiny_rom_entry *coco_rs232_device::device_rom_region() const
//**************************************************************************
DEFINE_DEVICE_TYPE_PRIVATE(COCO_RS232, device_cococart_interface, coco_rs232_device, "coco_rs232", "CoCo Deluxe RS-232 PAK")
template class device_finder<device_cococart_interface, false>;
template class device_finder<device_cococart_interface, true>;

2
src/devices/bus/coco/coco_ssc.cpp
View File

@ -146,8 +146,6 @@ namespace
DEFINE_DEVICE_TYPE_PRIVATE(COCO_SSC, device_cococart_interface, coco_ssc_device, "coco_ssc", "CoCo S/SC PAK");
DEFINE_DEVICE_TYPE(COCOSSC_SAC, cocossc_sac_device, "cocossc_sac", "CoCo SSC Sound Activity Circuit");
template class device_finder<device_cococart_interface, false>;
template class device_finder<device_cococart_interface, true>;
//**************************************************************************

2
src/devices/bus/coco/coco_t4426.cpp
View File

@ -225,8 +225,6 @@ INPUT_PORTS_END
//**************************************************************************
DEFINE_DEVICE_TYPE_PRIVATE(COCO_T4426, device_cococart_interface, coco_t4426_device, "coco_t4426", "Terco CNC Programming Station 4426 multi cart")
template class device_finder<device_cococart_interface, false>;
template class device_finder<device_cococart_interface, true>;
//**************************************************************************
// LIVE DEVICE

3
src/devices/bus/coco/cococart.cpp
View File

@ -447,6 +447,9 @@ std::string cococart_slot_device::get_default_card_software(get_default_card_sof
// CoCo cartridge slots
//**************************************************************************
template class device_finder<device_cococart_interface, false>;
template class device_finder<device_cococart_interface, true>;
//-------------------------------------------------
// device_cococart_interface - constructor
//-------------------------------------------------

3
src/devices/bus/coco/dragon_fdc.cpp
View File

@ -86,9 +86,6 @@
#define WD2797_TAG "wd2797"
template class device_finder<device_cococart_interface, false>;
template class device_finder<device_cococart_interface, true>;
/***************************************************************************
TYPE DEFINITIONS

3
src/devices/bus/ss50/interface.cpp
View File

@ -203,6 +203,9 @@ WRITE_LINE_MEMBER(ss50_interface_port_device::f600_1200_w)
// SS-50 CARD INTERFACE
//**************************************************************************
template class device_finder<ss50_card_interface, false>;
template class device_finder<ss50_card_interface, true>;
//-------------------------------------------------
// ss50_card_interface - construction
//-------------------------------------------------

2
src/devices/bus/ss50/mpc.cpp
View File

@ -191,5 +191,3 @@ WRITE_LINE_MEMBER(ss50_mpc_device::f300_w)
// device type definition
DEFINE_DEVICE_TYPE_PRIVATE(SS50_MPC, ss50_card_interface, ss50_mpc_device, "ss50_mpc", "MP-C Serial Control Interface")
template class device_finder<ss50_card_interface, false>;
template class device_finder<ss50_card_interface, true>;

2
src/devices/bus/ss50/mps.cpp
View File

@ -180,5 +180,3 @@ WRITE_LINE_MEMBER(ss50_mps_device::acia_irq_w)
// device type definition
DEFINE_DEVICE_TYPE_PRIVATE(SS50_MPS, ss50_card_interface, ss50_mps_device, "ss50_mps", "MP-S Serial Interface")
template class device_finder<ss50_card_interface, false>;
template class device_finder<ss50_card_interface, true>;