summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2016-06-19 16:51:45 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2016-06-19 16:51:45 +1000
commit7d18050b7bf4022e9c77114b1469aea7da79a538 (patch)
tree539b037403752c391102b2cbb30054e4d5646fb3 /src/devices/machine
parent91b1025fc26c5d5dee109b3d52a2206161c30f55 (diff)
Fixed compile error.
C:/MAME/src/devices/machine/hp_taco.h:50:14: error: 'virtual int hp_taco_device::call_display(std::__cxx11::string&)' marked 'override', but does not override virtual int call_display(std::string& s) override; ^ In file included from ../../../../../src/emu/emu.h:70:0: C:/MAME/src/emu/diimage.h:155:22: error: 'virtual std::__cxx11::string device_image_interface::call_display()' was hidden [-Werror=overloaded-virtual] virtual std::string call_display() { return std::string(); } ^ In file included from ../../../../../src/mame/drivers/hp9845.cpp:35:0: C:/MAME/src/devices/machine/hp_taco.h:50:14: error: by 'virtual int hp_taco_device::call_display(std::__cxx11::string&)' [-Werror=overloaded-virtual] virtual int call_display(std::string& s) override; ^ If "override" removed, this happened: Compiling src/mame/drivers/hp9845.cpp... In file included from ../../../../../src/emu/emu.h:70:0: C:/MAME/src/emu/diimage.h:155:22: error: 'virtual std::__cxx11::string device_image_interface::call_display()' was hidden [-Werror=overloaded-virtual] virtual std::string call_display() { return std::string(); } ^ In file included from ../../../../../src/mame/drivers/hp9845.cpp:35:0: C:/MAME/src/devices/machine/hp_taco.h:50:14: error: by 'virtual int hp_taco_device::call_display(std::__cxx11::string&)' [-Werror=overloaded-virtual] virtual int call_display(std::string& s); ^ Compiling src/devices/machine/hp_taco.cpp... In file included from ../../../../../src/emu/emu.h:70:0: C:/MAME/src/emu/diimage.h:155:22: error: 'virtual std::__cxx11::string device_image_interface::call_display()' was hidden [-Werror=overloaded-virtual] virtual std::string call_display() { return std::string(); } ^ In file included from ../../../../../src/devices/machine/hp_taco.cpp:141:0: C:/MAME/src/devices/machine/hp_taco.h:50:14: error: by 'virtual int hp_taco_device::call_display(std::__cxx11::string&)' [-Werror=overloaded-virtual] virtual int call_display(std::string& s); ^ So, the call was renamed in order for compilation to proceed.
Diffstat (limited to 'src/devices/machine')
-rw-r--r--src/devices/machine/hp_taco.cpp2
-rw-r--r--src/devices/machine/hp_taco.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/machine/hp_taco.cpp b/src/devices/machine/hp_taco.cpp
index 654c32f1182..c0f62514653 100644
--- a/src/devices/machine/hp_taco.cpp
+++ b/src/devices/machine/hp_taco.cpp
@@ -1686,7 +1686,7 @@ void hp_taco_device::call_unload()
set_tape_present(false);
}
-int hp_taco_device::call_display(std::string& s)
+int hp_taco_device::call_display_taco(std::string& s)
{
// Mostly lifted from cassette_image_device::call_display ;)
diff --git a/src/devices/machine/hp_taco.h b/src/devices/machine/hp_taco.h
index 4ae2ab9464f..0aeb41c9c36 100644
--- a/src/devices/machine/hp_taco.h
+++ b/src/devices/machine/hp_taco.h
@@ -47,7 +47,7 @@ public:
virtual bool call_load() override;
virtual bool call_create(int format_type, option_resolution *format_options) override;
virtual void call_unload() override;
- virtual int call_display(std::string& s) override;
+ virtual int call_display_taco(std::string& s);
virtual iodevice_t image_type() const override { return IO_MAGTAPE; }
virtual bool is_readable() const override { return true; }
virtual bool is_writeable() const override { return true; }