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/debugger.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/emu/debugger.cpp')
| -rw-r--r-- | src/emu/debugger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/debugger.cpp b/src/emu/debugger.cpp index d4ddd241389..b21e4ca779b 100644 --- a/src/emu/debugger.cpp +++ b/src/emu/debugger.cpp @@ -110,7 +110,7 @@ static void debugger_exit(running_machine &machine) machine_entry **entryptr; /* remove this machine from the list; it came down cleanly */ - for (entryptr = &machine_list; *entryptr != NULL; entryptr = &(*entryptr)->next) + for (entryptr = &machine_list; *entryptr != nullptr; entryptr = &(*entryptr)->next) if ((*entryptr)->machine == &machine) { machine_entry *deleteme = *entryptr; @@ -130,7 +130,7 @@ static void debugger_exit(running_machine &machine) void debugger_flush_all_traces_on_abnormal_exit(void) { /* clear out the machine list and flush traces on each one */ - while (machine_list != NULL) + while (machine_list != nullptr) { machine_entry *deleteme = machine_list; debug_cpu_flush_traces(*deleteme->machine); |
