Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-07 17:27:06 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix for ambiguous call to overloaded function when using MSVC (nw)

Browse Source
This commit is contained in:
smf- 2018-07-23 02:02:55 +01:00
parent 780bd423d2
commit 3527a722a1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/cpu/mcs40/mcs40.h
View File

@ -248,7 +248,7 @@ class i4004_cpu_device : public mcs40_cpu_device_base
{ {
public: public:
// configuration helpers // configuration helpers
auto sync_cb() { return mcs40_cpu_device_base::sync_cb(); } using mcs40_cpu_device_base::sync_cb;
auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb<0>(); } auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb<0>(); }
template <unsigned N> auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb<N>(); } template <unsigned N> auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb<N>(); }
@ -271,7 +271,6 @@ protected:
virtual u8 do_io(u8 opr, u8 opa) override; virtual u8 do_io(u8 opr, u8 opa) override;
// configuration helpers // configuration helpers
using mcs40_cpu_device_base::sync_cb;
using mcs40_cpu_device_base::cm_rom_cb; using mcs40_cpu_device_base::cm_rom_cb;
using mcs40_cpu_device_base::cm_ram_cb; using mcs40_cpu_device_base::cm_ram_cb;
}; };
@ -281,11 +280,10 @@ class i4040_cpu_device : public i4004_cpu_device
{ {
public: public:
// configuration helpers // configuration helpers
auto sync_cb() { return mcs40_cpu_device_base::sync_cb(); }
template <unsigned N> auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb<N>(); } template <unsigned N> auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb<N>(); }
template <unsigned N> auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb<N>(); } template <unsigned N> auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb<N>(); }
auto cy_cb() { return i4004_cpu_device::cy_cb(); } auto cy_cb() { return i4004_cpu_device::cy_cb(); }
auto stp_ack_cb() { return i4004_cpu_device::stp_ack_cb(); } using mcs40_cpu_device_base::stp_ack_cb;
i4040_cpu_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); i4040_cpu_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
@ -301,11 +299,9 @@ protected:
virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override; virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override;
// configuration helpers // configuration helpers
using mcs40_cpu_device_base::sync_cb;
using mcs40_cpu_device_base::cm_rom_cb; using mcs40_cpu_device_base::cm_rom_cb;
using mcs40_cpu_device_base::cm_ram_cb; using mcs40_cpu_device_base::cm_ram_cb;
using mcs40_cpu_device_base::cy_cb; using mcs40_cpu_device_base::cy_cb;
using mcs40_cpu_device_base::stp_ack_cb;
}; };