diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/emu/debug/dvbpoints.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/emu/debug/dvbpoints.cpp')
| -rw-r--r-- | src/emu/debug/dvbpoints.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/debug/dvbpoints.cpp b/src/emu/debug/dvbpoints.cpp index 2e4e16de68f..919f352842f 100644 --- a/src/emu/debug/dvbpoints.cpp +++ b/src/emu/debug/dvbpoints.cpp @@ -130,7 +130,7 @@ void debug_view_breakpoints::enumerate_sources() // iterate over devices with disassembly interfaces disasm_interface_iterator iter(machine().root_device()); - for (device_disasm_interface *dasm = iter.first(); dasm != NULL; dasm = iter.next()) + for (device_disasm_interface *dasm = iter.first(); dasm != nullptr; dasm = iter.next()) { std::string name; strprintf(name, "%s '%s'", dasm->device().name(), dasm->device().tag()); @@ -203,11 +203,11 @@ void debug_view_breakpoints::pad_astring_to_length(std::string& str, int len) void debug_view_breakpoints::gather_breakpoints() { m_buffer.resize(0); - for (const debug_view_source *source = m_source_list.first(); source != NULL; source = source->next()) + for (const debug_view_source *source = m_source_list.first(); source != nullptr; source = source->next()) { // Collect device_debug &debugInterface = *source->device()->debug(); - for (device_debug::breakpoint *bp = debugInterface.breakpoint_first(); bp != NULL; bp = bp->next()) + for (device_debug::breakpoint *bp = debugInterface.breakpoint_first(); bp != nullptr; bp = bp->next()) m_buffer.push_back(bp); } |
