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/devdelegate.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/emu/devdelegate.cpp')
| -rw-r--r-- | src/emu/devdelegate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/devdelegate.cpp b/src/emu/devdelegate.cpp index 53a03763e4a..8917d5dfc3f 100644 --- a/src/emu/devdelegate.cpp +++ b/src/emu/devdelegate.cpp @@ -20,7 +20,7 @@ delegate_late_bind &device_delegate_helper::bound_object(device_t &search_root) { device_t *device = search_root.subdevice(m_device_name); - if (device == NULL) + if (device == nullptr) throw emu_fatalerror("Unable to locate device '%s' relative to '%s'\n", m_device_name, search_root.tag()); return *device; } @@ -33,5 +33,5 @@ delegate_late_bind &device_delegate_helper::bound_object(device_t &search_root) const char *device_delegate_helper::safe_tag(device_t *object) { - return (object != NULL) ? object->tag() : "(unknown)"; + return (object != nullptr) ? object->tag() : "(unknown)"; } |
