summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/devdelegate.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
committer ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
commit4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch)
treedf0e1d28daa79b9151088498a933cd1fc37c9c07 /src/emu/devdelegate.cpp
parent1cda42b22e591965ee69561fcf52272bd991b3b2 (diff)
parent14d5966a379e9783ba724750a5f84a72af62cadc (diff)
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/emu/devdelegate.cpp')
-rw-r--r--src/emu/devdelegate.cpp4
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)";
}