From 3527a722a1dd205977d0339cbe5e1abaf8fcb3db Mon Sep 17 00:00:00 2001 From: smf- Date: Mon, 23 Jul 2018 02:02:55 +0100 Subject: fix for ambiguous call to overloaded function when using MSVC (nw) --- src/devices/cpu/mcs40/mcs40.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/devices/cpu/mcs40/mcs40.h b/src/devices/cpu/mcs40/mcs40.h index 88ba0d81194..d4778cd13c3 100644 --- a/src/devices/cpu/mcs40/mcs40.h +++ b/src/devices/cpu/mcs40/mcs40.h @@ -248,7 +248,7 @@ class i4004_cpu_device : public mcs40_cpu_device_base { public: // 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>(); } template auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb(); } @@ -271,7 +271,6 @@ protected: virtual u8 do_io(u8 opr, u8 opa) override; // configuration helpers - using mcs40_cpu_device_base::sync_cb; using mcs40_cpu_device_base::cm_rom_cb; using mcs40_cpu_device_base::cm_ram_cb; }; @@ -281,11 +280,10 @@ class i4040_cpu_device : public i4004_cpu_device { public: // configuration helpers - auto sync_cb() { return mcs40_cpu_device_base::sync_cb(); } template auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb(); } template auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_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); @@ -301,11 +299,9 @@ protected: virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override; // configuration helpers - using mcs40_cpu_device_base::sync_cb; using mcs40_cpu_device_base::cm_rom_cb; using mcs40_cpu_device_base::cm_ram_cb; using mcs40_cpu_device_base::cy_cb; - using mcs40_cpu_device_base::stp_ack_cb; }; -- cgit v1.2.3