From 3536bbdd7167b3982deca3e91960658ac620fdf1 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 31 Jan 2020 14:53:46 +1100 Subject: there are reasons for things being the way they were (nw) --- src/devices/cpu/uml.cpp | 8 +++---- src/devices/cpu/uml.h | 8 +++---- src/lib/util/corefile.cpp | 9 ++++++++ src/lib/util/corefile.h | 2 +- src/lib/util/options.cpp | 27 ++++++++++++++++++++++ src/lib/util/options.h | 6 ++--- src/lib/util/unzip.cpp | 5 ++++ src/lib/util/unzip.h | 2 +- src/lib/util/zippath.cpp | 10 ++++++++ src/lib/util/zippath.h | 2 +- src/mame/drivers/amiga.cpp | 2 +- src/mame/drivers/nes.cpp | 15 ++++++++---- src/mame/includes/nes.h | 8 +++---- src/osd/modules/debugger/win/consolewininfo.cpp | 5 ++++ src/osd/modules/debugger/win/consolewininfo.h | 2 +- src/osd/modules/debugger/win/debugwininfo.cpp | 5 ++++ src/osd/modules/debugger/win/debugwininfo.h | 2 +- src/osd/modules/debugger/win/disasmbasewininfo.cpp | 5 ++++ src/osd/modules/debugger/win/disasmbasewininfo.h | 2 +- src/osd/modules/debugger/win/disasmviewinfo.cpp | 5 ++++ src/osd/modules/debugger/win/disasmviewinfo.h | 4 ++-- src/osd/modules/debugger/win/disasmwininfo.cpp | 5 ++++ src/osd/modules/debugger/win/disasmwininfo.h | 2 +- src/osd/modules/debugger/win/editwininfo.cpp | 5 ++++ src/osd/modules/debugger/win/editwininfo.h | 2 +- src/osd/modules/debugger/win/logviewinfo.cpp | 5 ++++ src/osd/modules/debugger/win/logviewinfo.h | 4 ++-- src/osd/modules/debugger/win/logwininfo.cpp | 5 ++++ src/osd/modules/debugger/win/logwininfo.h | 2 +- src/osd/modules/debugger/win/memoryviewinfo.cpp | 5 ++++ src/osd/modules/debugger/win/memoryviewinfo.h | 4 ++-- src/osd/modules/debugger/win/pointswininfo.cpp | 5 ++++ src/osd/modules/debugger/win/pointswininfo.h | 2 +- src/osd/modules/diagnostics/diagnostics_win32.cpp | 22 ++++++++++++++++-- src/osd/modules/render/bgfx/inputpair.cpp | 4 ++++ src/osd/modules/render/bgfx/inputpair.h | 2 +- src/osd/osdnet.cpp | 4 ++++ src/osd/osdnet.h | 2 +- src/osd/windows/winmain.cpp | 9 ++++++++ src/osd/windows/winmain.h | 2 +- 40 files changed, 183 insertions(+), 42 deletions(-) diff --git a/src/devices/cpu/uml.cpp b/src/devices/cpu/uml.cpp index 5c38c40b6dc..df52f5f1235 100644 --- a/src/devices/cpu/uml.cpp +++ b/src/devices/cpu/uml.cpp @@ -307,7 +307,7 @@ void uml::instruction::configure(opcode_t op, u8 size, condition_t condition) // parameter //------------------------------------------------- -void uml::instruction::configure(opcode_t op, u8 size, const parameter &p0, condition_t condition) +void uml::instruction::configure(opcode_t op, u8 size, parameter p0, condition_t condition) { // fill in the instruction m_opcode = opcode_t(u8(op)); @@ -327,7 +327,7 @@ void uml::instruction::configure(opcode_t op, u8 size, const parameter &p0, cond // parameters //------------------------------------------------- -void uml::instruction::configure(opcode_t op, u8 size, const parameter &p0, const parameter &p1, condition_t condition) +void uml::instruction::configure(opcode_t op, u8 size, parameter p0, parameter p1, condition_t condition) { // fill in the instruction m_opcode = opcode_t(u8(op)); @@ -348,7 +348,7 @@ void uml::instruction::configure(opcode_t op, u8 size, const parameter &p0, cons // parameters //------------------------------------------------- -void uml::instruction::configure(opcode_t op, u8 size, const parameter &p0, const parameter &p1, const parameter &p2, condition_t condition) +void uml::instruction::configure(opcode_t op, u8 size, parameter p0, parameter p1, parameter p2, condition_t condition) { // fill in the instruction m_opcode = opcode_t(u8(op)); @@ -370,7 +370,7 @@ void uml::instruction::configure(opcode_t op, u8 size, const parameter &p0, cons // parameters //------------------------------------------------- -void uml::instruction::configure(opcode_t op, u8 size, const parameter &p0, const parameter &p1, const parameter &p2, const parameter &p3, condition_t condition) +void uml::instruction::configure(opcode_t op, u8 size, parameter p0, parameter p1, parameter p2, parameter p3, condition_t condition) { // fill in the instruction m_opcode = opcode_t(u8(op)); diff --git a/src/devices/cpu/uml.h b/src/devices/cpu/uml.h index c3c83944e85..662a0dda2b6 100644 --- a/src/devices/cpu/uml.h +++ b/src/devices/cpu/uml.h @@ -577,10 +577,10 @@ namespace uml private: // internal configuration void configure(opcode_t op, u8 size, condition_t cond = COND_ALWAYS); - void configure(opcode_t op, u8 size, const parameter &p0, condition_t cond = COND_ALWAYS); - void configure(opcode_t op, u8 size, const parameter &p0, const parameter &p1, condition_t cond = COND_ALWAYS); - void configure(opcode_t op, u8 size, const parameter &p0, const parameter &p1, const parameter &p2, condition_t cond = COND_ALWAYS); - void configure(opcode_t op, u8 size, const parameter &p0, const parameter &p1, const parameter &p2, const parameter &p3, condition_t cond = COND_ALWAYS); + void configure(opcode_t op, u8 size, parameter p0, condition_t cond = COND_ALWAYS); + void configure(opcode_t op, u8 size, parameter p0, parameter p1, condition_t cond = COND_ALWAYS); + void configure(opcode_t op, u8 size, parameter p0, parameter p1, parameter p2, condition_t cond = COND_ALWAYS); + void configure(opcode_t op, u8 size, parameter p0, parameter p1, parameter p2, parameter p3, condition_t cond = COND_ALWAYS); // opcode validation and simplification void validate(); diff --git a/src/lib/util/corefile.cpp b/src/lib/util/corefile.cpp index 1fe33c7e348..d241dac6ed1 100644 --- a/src/lib/util/corefile.cpp +++ b/src/lib/util/corefile.cpp @@ -1161,6 +1161,15 @@ osd_file::error core_file::open_proxy(core_file &file, ptr &proxy) } +/*------------------------------------------------- + closes a file +-------------------------------------------------*/ + +core_file::~core_file() +{ +} + + /*------------------------------------------------- load - open a file with the specified filename, read it into memory, and return a diff --git a/src/lib/util/corefile.h b/src/lib/util/corefile.h index cfbe57227d3..99496b964e8 100644 --- a/src/lib/util/corefile.h +++ b/src/lib/util/corefile.h @@ -61,7 +61,7 @@ public: static osd_file::error open_proxy(core_file &file, ptr &proxy); // close an open file - virtual ~core_file() = default; + virtual ~core_file(); // enable/disable streaming file compression via zlib; level is 0 to disable compression, or up to 9 for max compression virtual osd_file::error compress(int level) = 0; diff --git a/src/lib/util/options.cpp b/src/lib/util/options.cpp index cbc9c817dbf..fd0783ccaae 100644 --- a/src/lib/util/options.cpp +++ b/src/lib/util/options.cpp @@ -125,6 +125,15 @@ core_options::entry::entry(std::string &&name, core_options::option_type type, c } +//------------------------------------------------- +// entry - destructor +//------------------------------------------------- + +core_options::entry::~entry() +{ +} + + //------------------------------------------------- // entry::value //------------------------------------------------- @@ -327,6 +336,15 @@ core_options::simple_entry::simple_entry(std::vector &&names, const } +//------------------------------------------------- +// simple_entry - destructor +//------------------------------------------------- + +core_options::simple_entry::~simple_entry() +{ +} + + //------------------------------------------------- // simple_entry::value //------------------------------------------------- @@ -404,6 +422,15 @@ const char *core_options::simple_entry::maximum() const noexcept // CORE OPTIONS //************************************************************************** +//------------------------------------------------- +// ~core_options - destructor +//------------------------------------------------- + +core_options::~core_options() +{ +} + + //------------------------------------------------- // add_entry - adds an entry //------------------------------------------------- diff --git a/src/lib/util/options.h b/src/lib/util/options.h index dc86786fed1..a28720a0373 100644 --- a/src/lib/util/options.h +++ b/src/lib/util/options.h @@ -111,7 +111,7 @@ public: entry(entry &&) = delete; entry& operator=(const entry &) = delete; entry& operator=(entry &&) = delete; - virtual ~entry() = default; + virtual ~entry(); // accessors const std::vector &names() const noexcept { return m_names; } @@ -152,7 +152,7 @@ public: core_options(core_options &&) = default; core_options& operator=(const core_options &) = delete; core_options& operator=(core_options &&) = default; - virtual ~core_options() = default; + virtual ~core_options(); // getters const std::string &command() const noexcept { return m_command; } @@ -213,7 +213,7 @@ private: simple_entry(simple_entry &&) = delete; simple_entry& operator=(const simple_entry &) = delete; simple_entry& operator=(simple_entry &&) = delete; - ~simple_entry() = default; + virtual ~simple_entry(); // getters virtual const char *value() const noexcept override; diff --git a/src/lib/util/unzip.cpp b/src/lib/util/unzip.cpp index 2fb3da55c3c..a659445e1cc 100644 --- a/src/lib/util/unzip.cpp +++ b/src/lib/util/unzip.cpp @@ -1479,4 +1479,9 @@ void archive_file::cache_clear() m7z_file_cache_clear(); } + +archive_file::~archive_file() +{ +} + } // namespace util diff --git a/src/lib/util/unzip.h b/src/lib/util/unzip.h index 28d348a5738..a1388cd0b4c 100644 --- a/src/lib/util/unzip.h +++ b/src/lib/util/unzip.h @@ -57,7 +57,7 @@ public: static error open_7z(const std::string &filename, ptr &result); // close an archive file (may actually be left open due to caching) - virtual ~archive_file() = default; + virtual ~archive_file(); // clear out all open files from the cache static void cache_clear(); diff --git a/src/lib/util/zippath.cpp b/src/lib/util/zippath.cpp index 3dcccd5ee30..760c64fd066 100644 --- a/src/lib/util/zippath.cpp +++ b/src/lib/util/zippath.cpp @@ -614,6 +614,16 @@ osd_file::error zippath_directory::open(std::string const &path, ptr &directory) } +// ------------------------------------------------- +// zippath_directory::~zippath_directory - closes +// a directory +// ------------------------------------------------- + +zippath_directory::~zippath_directory() +{ +} + + // ------------------------------------------------- // zippath_parent - retrieves the parent directory // ------------------------------------------------- diff --git a/src/lib/util/zippath.h b/src/lib/util/zippath.h index bbaf21af8b1..cf6c2249f9c 100644 --- a/src/lib/util/zippath.h +++ b/src/lib/util/zippath.h @@ -34,7 +34,7 @@ public: static osd_file::error open(std::string const &path, ptr &directory); // closes a directory - virtual ~zippath_directory() = default; + virtual ~zippath_directory(); // reads a directory entry virtual osd::directory::entry const *readdir() = 0; diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp index cd1e055da5a..f8aed0bf07c 100644 --- a/src/mame/drivers/amiga.cpp +++ b/src/mame/drivers/amiga.cpp @@ -100,7 +100,7 @@ public: auto kbrst_cb() { return m_kbrst_cb.bind(); } - a1000_kbreset_device &set_delays(const attotime &detect, const attotime &stray, const attotime &output) + a1000_kbreset_device &set_delays(attotime detect, attotime stray, attotime output) { m_detect_time = detect; m_stray_time = stray; diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp index 59b38b9c1e7..4ad7f1966d4 100644 --- a/src/mame/drivers/nes.cpp +++ b/src/mame/drivers/nes.cpp @@ -27,11 +27,11 @@ WRITE8_MEMBER(nes_state::nes_vh_sprite_dma_w) void nes_state::nes_map(address_map &map) { - map(0x0000, 0x07ff).ram().mirror(0x1800); /* RAM */ - map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); /* PPU registers */ - map(0x4014, 0x4014).w(FUNC(nes_state::nes_vh_sprite_dma_w)); /* stupid address space hole */ - map(0x4016, 0x4016).rw(FUNC(nes_state::nes_in0_r), FUNC(nes_state::nes_in0_w)); /* IN0 - input port 1 */ - map(0x4017, 0x4017).r(FUNC(nes_state::nes_in1_r)); /* IN1 - input port 2 */ + map(0x0000, 0x07ff).ram().mirror(0x1800); // RAM + map(0x2000, 0x3fff).rw(m_ppu, FUNC(ppu2c0x_device::read), FUNC(ppu2c0x_device::write)); // PPU registers + map(0x4014, 0x4014).w(FUNC(nes_state::nes_vh_sprite_dma_w)); // stupid address space hole + map(0x4016, 0x4016).rw(FUNC(nes_state::nes_in0_r), FUNC(nes_state::nes_in0_w)); // IN0 - input port 1 + map(0x4017, 0x4017).r(FUNC(nes_state::nes_in1_r)); // IN1 - input port 2 // 0x4100-0x5fff -> LOW HANDLER defined on a pcb base // 0x6000-0x7fff -> MID HANDLER defined on a pcb base // 0x8000-0xffff -> HIGH HANDLER defined on a pcb base @@ -91,6 +91,7 @@ void nes_state::nes(machine_config &config) void nes_state::nespal(machine_config &config) { nes(config); + /* basic machine hardware */ m_maincpu->set_clock(PAL_APU_CLOCK); @@ -111,6 +112,7 @@ void nes_state::nespal(machine_config &config) void nes_state::famicom(machine_config &config) { nes(config); + NES_CONTROL_PORT(config.replace(), m_ctrl1, fc_control_port1_devices, "joypad"); NES_CONTROL_PORT(config.replace(), m_ctrl2, fc_control_port2_devices, "joypad"); NES_CONTROL_PORT(config, m_exp, fc_expansion_devices, nullptr); @@ -125,6 +127,7 @@ void nes_state::famicom(machine_config &config) void nes_state::nespalc(machine_config &config) { nespal(config); + m_maincpu->set_clock(PALC_APU_CLOCK); m_maincpu->set_addrmap(AS_PROGRAM, &nes_state::nes_map); @@ -144,6 +147,7 @@ void nes_state::nespalc(machine_config &config) void nes_state::famipalc(machine_config &config) { nespalc(config); + NES_CONTROL_PORT(config.replace(), m_ctrl1, fc_control_port1_devices, "joypad"); NES_CONTROL_PORT(config.replace(), m_ctrl2, fc_control_port2_devices, "joypad"); NES_CONTROL_PORT(config, m_exp, fc_expansion_devices, nullptr); @@ -157,6 +161,7 @@ void nes_state::famipalc(machine_config &config) void nes_state::suborkbd(machine_config &config) { famipalc(config); + /* TODO: emulate the parallel port bus! */ m_exp->set_default_option("subor_keyboard"); m_exp->set_fixed(true); diff --git a/src/mame/includes/nes.h b/src/mame/includes/nes.h index ee722e92b36..b0717a6ad19 100644 --- a/src/mame/includes/nes.h +++ b/src/mame/includes/nes.h @@ -52,8 +52,8 @@ class nes_base_state : public driver_device { public: - nes_base_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + nes_base_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ctrl1(*this, "ctrl1"), m_ctrl2(*this, "ctrl2") @@ -71,8 +71,8 @@ public: class nes_state : public nes_base_state { public: - nes_state(const machine_config &mconfig, device_type type, const char *tag) - : nes_base_state(mconfig, type, tag), + nes_state(const machine_config &mconfig, device_type type, const char *tag) : + nes_base_state(mconfig, type, tag), m_ppu(*this, "ppu"), m_screen(*this, "screen"), m_exp(*this, "exp"), diff --git a/src/osd/modules/debugger/win/consolewininfo.cpp b/src/osd/modules/debugger/win/consolewininfo.cpp index 6af21800813..6ca18743945 100644 --- a/src/osd/modules/debugger/win/consolewininfo.cpp +++ b/src/osd/modules/debugger/win/consolewininfo.cpp @@ -91,6 +91,11 @@ cleanup: } +consolewin_info::~consolewin_info() +{ +} + + void consolewin_info::set_cpu(device_t &device) { // exit if this cpu is already selected diff --git a/src/osd/modules/debugger/win/consolewininfo.h b/src/osd/modules/debugger/win/consolewininfo.h index 49d40d01b90..e391100ed33 100644 --- a/src/osd/modules/debugger/win/consolewininfo.h +++ b/src/osd/modules/debugger/win/consolewininfo.h @@ -19,7 +19,7 @@ class consolewin_info : public disasmbasewin_info { public: consolewin_info(debugger_windows_interface &debugger); - virtual ~consolewin_info() = default; + virtual ~consolewin_info(); void set_cpu(device_t &device); diff --git a/src/osd/modules/debugger/win/debugwininfo.cpp b/src/osd/modules/debugger/win/debugwininfo.cpp index 4365fbbe954..1645582038c 100644 --- a/src/osd/modules/debugger/win/debugwininfo.cpp +++ b/src/osd/modules/debugger/win/debugwininfo.cpp @@ -48,6 +48,11 @@ debugwin_info::debugwin_info(debugger_windows_interface &debugger, bool is_main_ } +debugwin_info::~debugwin_info() +{ +} + + void debugwin_info::destroy() { for (int curview = 0; curview < MAX_VIEWS; curview++) diff --git a/src/osd/modules/debugger/win/debugwininfo.h b/src/osd/modules/debugger/win/debugwininfo.h index 4da52691478..b930189fffa 100644 --- a/src/osd/modules/debugger/win/debugwininfo.h +++ b/src/osd/modules/debugger/win/debugwininfo.h @@ -19,7 +19,7 @@ class debugwin_info : protected debugbase_info { public: debugwin_info(debugger_windows_interface &debugger, bool is_main_console, LPCSTR title, WNDPROC handler); - virtual ~debugwin_info() = default; + virtual ~debugwin_info(); bool is_valid() const { return m_wnd != nullptr; } diff --git a/src/osd/modules/debugger/win/disasmbasewininfo.cpp b/src/osd/modules/debugger/win/disasmbasewininfo.cpp index 6cb082695ce..0d22b7b8d39 100644 --- a/src/osd/modules/debugger/win/disasmbasewininfo.cpp +++ b/src/osd/modules/debugger/win/disasmbasewininfo.cpp @@ -49,6 +49,11 @@ disasmbasewin_info::disasmbasewin_info(debugger_windows_interface &debugger, boo } +disasmbasewin_info::~disasmbasewin_info() +{ +} + + bool disasmbasewin_info::handle_key(WPARAM wparam, LPARAM lparam) { if (GetAsyncKeyState(VK_CONTROL) & 0x8000) diff --git a/src/osd/modules/debugger/win/disasmbasewininfo.h b/src/osd/modules/debugger/win/disasmbasewininfo.h index 83031b242f5..c22f7f08e78 100644 --- a/src/osd/modules/debugger/win/disasmbasewininfo.h +++ b/src/osd/modules/debugger/win/disasmbasewininfo.h @@ -19,7 +19,7 @@ class disasmbasewin_info : public editwin_info { public: disasmbasewin_info(debugger_windows_interface &debugger, bool is_main_console, LPCSTR title, WNDPROC handler); - virtual ~disasmbasewin_info() = default; + virtual ~disasmbasewin_info(); virtual bool handle_key(WPARAM wparam, LPARAM lparam) override; diff --git a/src/osd/modules/debugger/win/disasmviewinfo.cpp b/src/osd/modules/debugger/win/disasmviewinfo.cpp index 418f3f2f9f3..8884bee5195 100644 --- a/src/osd/modules/debugger/win/disasmviewinfo.cpp +++ b/src/osd/modules/debugger/win/disasmviewinfo.cpp @@ -16,6 +16,11 @@ disasmview_info::disasmview_info(debugger_windows_interface &debugger, debugwin_ } +disasmview_info::~disasmview_info() +{ +} + + disasm_right_column disasmview_info::right_column() const { return view()->right_column(); diff --git a/src/osd/modules/debugger/win/disasmviewinfo.h b/src/osd/modules/debugger/win/disasmviewinfo.h index f5ca6b5dde6..0685d762346 100644 --- a/src/osd/modules/debugger/win/disasmviewinfo.h +++ b/src/osd/modules/debugger/win/disasmviewinfo.h @@ -21,7 +21,7 @@ class disasmview_info : public debugview_info { public: disasmview_info(debugger_windows_interface &debugger, debugwin_info &owner, HWND parent); - virtual ~disasmview_info() = default; + virtual ~disasmview_info(); disasm_right_column right_column() const; offs_t selected_address() const; @@ -30,4 +30,4 @@ public: void set_right_column(disasm_right_column contents); }; -#endif +#endif // MAME_DEBUGGER_WIN_DISASMVIEWINFO_H diff --git a/src/osd/modules/debugger/win/disasmwininfo.cpp b/src/osd/modules/debugger/win/disasmwininfo.cpp index 835448ec1f1..582bfa3dadc 100644 --- a/src/osd/modules/debugger/win/disasmwininfo.cpp +++ b/src/osd/modules/debugger/win/disasmwininfo.cpp @@ -45,6 +45,11 @@ disasmwin_info::disasmwin_info(debugger_windows_interface &debugger) : } +disasmview_info::~disasmwin_info() +{ +} + + void disasmwin_info::recompute_children() { // compute a client rect diff --git a/src/osd/modules/debugger/win/disasmwininfo.h b/src/osd/modules/debugger/win/disasmwininfo.h index 6ee7eabd7e5..71764bab0ef 100644 --- a/src/osd/modules/debugger/win/disasmwininfo.h +++ b/src/osd/modules/debugger/win/disasmwininfo.h @@ -19,7 +19,7 @@ class disasmwin_info : public disasmbasewin_info { public: disasmwin_info(debugger_windows_interface &debugger); - virtual ~disasmwin_info() = default; + virtual ~disasmwin_info(); protected: virtual void recompute_children() override; diff --git a/src/osd/modules/debugger/win/editwininfo.cpp b/src/osd/modules/debugger/win/editwininfo.cpp index 29641443536..61717439c25 100644 --- a/src/osd/modules/debugger/win/editwininfo.cpp +++ b/src/osd/modules/debugger/win/editwininfo.cpp @@ -51,6 +51,11 @@ editwin_info::editwin_info(debugger_windows_interface &debugger, bool is_main_co } +editwin_info::~editwin_info() +{ +} + + bool editwin_info::restore_field(HWND wnd) { if (wnd == m_editwnd) diff --git a/src/osd/modules/debugger/win/editwininfo.h b/src/osd/modules/debugger/win/editwininfo.h index 661b89b91dc..2156d8ba68d 100644 --- a/src/osd/modules/debugger/win/editwininfo.h +++ b/src/osd/modules/debugger/win/editwininfo.h @@ -22,7 +22,7 @@ class editwin_info : public debugwin_info { public: editwin_info(debugger_windows_interface &debugger, bool is_main_console, LPCSTR title, WNDPROC handler); - virtual ~editwin_info() = default; + virtual ~editwin_info(); virtual bool restore_field(HWND wnd) override; diff --git a/src/osd/modules/debugger/win/logviewinfo.cpp b/src/osd/modules/debugger/win/logviewinfo.cpp index 58f49be9ddb..affd4acd17a 100644 --- a/src/osd/modules/debugger/win/logviewinfo.cpp +++ b/src/osd/modules/debugger/win/logviewinfo.cpp @@ -18,6 +18,11 @@ logview_info::logview_info(debugger_windows_interface &debugger, debugwin_info & } +logview_info::~logview_info() +{ +} + + void logview_info::clear() { view()->clear(); diff --git a/src/osd/modules/debugger/win/logviewinfo.h b/src/osd/modules/debugger/win/logviewinfo.h index 58008f19f88..d7ca0df8c9e 100644 --- a/src/osd/modules/debugger/win/logviewinfo.h +++ b/src/osd/modules/debugger/win/logviewinfo.h @@ -19,9 +19,9 @@ class logview_info : public debugview_info { public: logview_info(debugger_windows_interface &debugger, debugwin_info &owner, HWND parent); - virtual ~logview_info() = default; + virtual ~logview_info(); void clear(); }; -#endif +#endif // MAME_DEBUGGER_WIN_LOGVIEWINFO_H diff --git a/src/osd/modules/debugger/win/logwininfo.cpp b/src/osd/modules/debugger/win/logwininfo.cpp index cac9e76e385..6ed0f63a1c3 100644 --- a/src/osd/modules/debugger/win/logwininfo.cpp +++ b/src/osd/modules/debugger/win/logwininfo.cpp @@ -49,6 +49,11 @@ logwin_info::logwin_info(debugger_windows_interface &debugger) : } +logwin_info::~logwin_info() +{ +} + + bool logwin_info::handle_command(WPARAM wparam, LPARAM lparam) { if ((HIWORD(wparam) == 0) && (LOWORD(wparam) == ID_CLEAR_LOG)) diff --git a/src/osd/modules/debugger/win/logwininfo.h b/src/osd/modules/debugger/win/logwininfo.h index c74825b38cb..b40d184485e 100644 --- a/src/osd/modules/debugger/win/logwininfo.h +++ b/src/osd/modules/debugger/win/logwininfo.h @@ -19,7 +19,7 @@ class logwin_info : public debugwin_info { public: logwin_info(debugger_windows_interface &debugger); - virtual ~logwin_info() = default; + virtual ~logwin_info(); protected: virtual bool handle_command(WPARAM wparam, LPARAM lparam) override; diff --git a/src/osd/modules/debugger/win/memoryviewinfo.cpp b/src/osd/modules/debugger/win/memoryviewinfo.cpp index 6cdf4e4911d..423679f26a9 100644 --- a/src/osd/modules/debugger/win/memoryviewinfo.cpp +++ b/src/osd/modules/debugger/win/memoryviewinfo.cpp @@ -18,6 +18,11 @@ memoryview_info::memoryview_info(debugger_windows_interface &debugger, debugwin_ } +memoryview_info::~memoryview_info() +{ +} + + uint8_t memoryview_info::data_format() const { return view()->get_data_format(); diff --git a/src/osd/modules/debugger/win/memoryviewinfo.h b/src/osd/modules/debugger/win/memoryviewinfo.h index 52d1a20947d..d2c5d719abe 100644 --- a/src/osd/modules/debugger/win/memoryviewinfo.h +++ b/src/osd/modules/debugger/win/memoryviewinfo.h @@ -19,7 +19,7 @@ class memoryview_info : public debugview_info { public: memoryview_info(debugger_windows_interface &debugger, debugwin_info &owner, HWND parent); - virtual ~memoryview_info() = default; + virtual ~memoryview_info(); uint8_t data_format() const; uint32_t chunks_per_row() const; @@ -33,4 +33,4 @@ public: void set_physical(bool physical); }; -#endif +#endif // MAME_DEBUGGER_WIN_MEMORYVIEWINFO_H diff --git a/src/osd/modules/debugger/win/pointswininfo.cpp b/src/osd/modules/debugger/win/pointswininfo.cpp index 602aac1bc9d..24a8f865e6f 100644 --- a/src/osd/modules/debugger/win/pointswininfo.cpp +++ b/src/osd/modules/debugger/win/pointswininfo.cpp @@ -51,6 +51,11 @@ pointswin_info::pointswin_info(debugger_windows_interface &debugger) : } +pointswin_info::~pointswin_info() +{ +} + + bool pointswin_info::handle_key(WPARAM wparam, LPARAM lparam) { if (GetAsyncKeyState(VK_CONTROL) & 0x8000) diff --git a/src/osd/modules/debugger/win/pointswininfo.h b/src/osd/modules/debugger/win/pointswininfo.h index e9701b02ab6..4e36155105e 100644 --- a/src/osd/modules/debugger/win/pointswininfo.h +++ b/src/osd/modules/debugger/win/pointswininfo.h @@ -19,7 +19,7 @@ class pointswin_info : public debugwin_info { public: pointswin_info(debugger_windows_interface &debugger); - virtual ~pointswin_info() = default; + virtual ~pointswin_info(); virtual bool handle_key(WPARAM wparam, LPARAM lparam) override; diff --git a/src/osd/modules/diagnostics/diagnostics_win32.cpp b/src/osd/modules/diagnostics/diagnostics_win32.cpp index 4ba70a58905..e76f3ca6d70 100644 --- a/src/osd/modules/diagnostics/diagnostics_win32.cpp +++ b/src/osd/modules/diagnostics/diagnostics_win32.cpp @@ -77,7 +77,7 @@ class symbol_manager public: // construction/destruction symbol_manager(const char *argv0); - ~symbol_manager() = default; + ~symbol_manager(); // getters uintptr_t last_base() const { return m_last_base; } @@ -128,7 +128,7 @@ class sampling_profiler { public: sampling_profiler(uint32_t max_seconds, uint8_t stack_depth); - ~sampling_profiler() = default; + ~sampling_profiler(); void start(); void stop(); @@ -321,6 +321,15 @@ symbol_manager::symbol_manager(const char *argv0) } +//------------------------------------------------- +// ~symbol_manager - destructor +//------------------------------------------------- + +symbol_manager::~symbol_manager() +{ +} + + //------------------------------------------------- // symbol_for_address - return a symbol by looking // it up either in the cache or by scanning the @@ -646,6 +655,15 @@ sampling_profiler::sampling_profiler(uint32_t max_seconds, uint8_t stack_depth = //------------------------------------------------- +// sampling_profiler - destructor +//------------------------------------------------- + +sampling_profiler::~sampling_profiler() +{ +} + + +////------------------------------------------------- // start - begin gathering profiling information //------------------------------------------------- diff --git a/src/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp index f5d0ab3c867..9fd2b0e6855 100644 --- a/src/osd/modules/render/bgfx/inputpair.cpp +++ b/src/osd/modules/render/bgfx/inputpair.cpp @@ -40,6 +40,10 @@ bgfx_input_pair::bgfx_input_pair(int index, std::string sampler, std::string tex } } +bgfx_input_pair::~bgfx_input_pair() +{ +} + void bgfx_input_pair::bind(bgfx_effect *effect, const int32_t screen) const { if (effect->uniform(m_sampler) == nullptr) diff --git a/src/osd/modules/render/bgfx/inputpair.h b/src/osd/modules/render/bgfx/inputpair.h index bdccaa1a20a..8060ce8c4dd 100644 --- a/src/osd/modules/render/bgfx/inputpair.h +++ b/src/osd/modules/render/bgfx/inputpair.h @@ -27,7 +27,7 @@ class bgfx_input_pair : public slider_changed_notifier { public: bgfx_input_pair(int index, std::string sampler, std::string texture, std::vector available_textures, std::string selection, chain_manager& chains, uint32_t screen_index); - ~bgfx_input_pair() = default; + virtual ~bgfx_input_pair(); void bind(bgfx_effect *effect, const int32_t screen) const; int32_t texture_changed(int32_t index, std::string *str, int32_t newval); diff --git a/src/osd/osdnet.cpp b/src/osd/osdnet.cpp index a1d71ebae36..070b4e96a2d 100644 --- a/src/osd/osdnet.cpp +++ b/src/osd/osdnet.cpp @@ -42,6 +42,10 @@ osd_netdev::osd_netdev(class device_network_interface *ifdev, int rate) m_timer->adjust(attotime::from_hz(rate), 0, attotime::from_hz(rate)); } +osd_netdev::~osd_netdev() +{ +} + void osd_netdev::start() { m_timer->enable(true); diff --git a/src/osd/osdnet.h b/src/osd/osdnet.h index fecf65e1935..226ae2319a9 100644 --- a/src/osd/osdnet.h +++ b/src/osd/osdnet.h @@ -21,7 +21,7 @@ public: create_netdev func; }; osd_netdev(class device_network_interface *ifdev, int rate); - virtual ~osd_netdev() = default; + virtual ~osd_netdev(); void start(); void stop(); diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp index c9f30308888..05888769c0d 100644 --- a/src/osd/windows/winmain.cpp +++ b/src/osd/windows/winmain.cpp @@ -489,6 +489,15 @@ windows_osd_interface::windows_osd_interface(windows_options &options) } +//============================================================ +// destructor +//============================================================ + +windows_osd_interface::~windows_osd_interface() +{ +} + + //============================================================ // video_register //============================================================ diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h index c5c75a7dfae..faca28e5bca 100644 --- a/src/osd/windows/winmain.h +++ b/src/osd/windows/winmain.h @@ -275,7 +275,7 @@ class windows_osd_interface : public osd_common_t public: // construction/destruction windows_osd_interface(windows_options &options); - virtual ~windows_osd_interface() = default; + virtual ~windows_osd_interface(); // general overridables virtual void init(running_machine &machine) override; -- cgit v1.2.3