Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 17:30:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed compile error.

Browse Source 
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.
This commit is contained in:
Robbbert 2016-06-19 16:51:45 +10:00
parent 91b1025fc2
commit 7d18050b7b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/machine/hp_taco.cpp
View File

@ -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 ;)

2
src/devices/machine/hp_taco.h
View File

@ -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; }