diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/osd/modules/debugger/none.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/osd/modules/debugger/none.cpp')
| -rw-r--r-- | src/osd/modules/debugger/none.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/osd/modules/debugger/none.cpp b/src/osd/modules/debugger/none.cpp index 48085afd089..27157bbee1b 100644 --- a/src/osd/modules/debugger/none.cpp +++ b/src/osd/modules/debugger/none.cpp @@ -16,18 +16,18 @@ class debug_none : public osd_module, public debug_module public: debug_none() : osd_module(OSD_DEBUG_PROVIDER, "none"), debug_module(), - m_machine(NULL) + m_machine(nullptr) { } virtual ~debug_none() { } - virtual int init(const osd_options &options) { return 0; } - virtual void exit() { } + virtual int init(const osd_options &options) override { return 0; } + virtual void exit() override { } - virtual void init_debugger(running_machine &machine); - virtual void wait_for_debugger(device_t &device, bool firststop); - virtual void debugger_update(); + virtual void init_debugger(running_machine &machine) override; + virtual void wait_for_debugger(device_t &device, bool firststop) override; + virtual void debugger_update() override; private: running_machine *m_machine; |
