summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/device.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-08-26 23:02:53 +0200
committer Olivier Galibert <galibert@pobox.com>2018-08-26 23:03:06 +0200
commitbadc06d1f546c6a4a1bcf5f348a2b83a10d63d14 (patch)
treee778659d8112cf3568cea1dd4947c9d956f1a317 /src/emu/device.cpp
parent96e931301601ee96435a3cd7d7797af9a3ae3dd6 (diff)
Fix main fallout (nw)
Diffstat (limited to 'src/emu/device.cpp')
-rw-r--r--src/emu/device.cpp33
1 files changed, 9 insertions, 24 deletions
diff --git a/src/emu/device.cpp b/src/emu/device.cpp
index aa6e2342411..42edf893168 100644
--- a/src/emu/device.cpp
+++ b/src/emu/device.cpp
@@ -130,14 +130,9 @@ device_t::~device_t()
memory_region *device_t::memregion(std::string _tag) const
{
// build a fully-qualified name and look it up
- if (_tag != "")
- {
- auto search = machine().memory().regions().find(subtag(_tag).c_str());
- if (search != machine().memory().regions().end())
- return search->second.get();
- else
- return nullptr;
- }
+ auto search = machine().memory().regions().find(subtag(_tag).c_str());
+ if (search != machine().memory().regions().end())
+ return search->second.get();
else
return nullptr;
}
@@ -151,14 +146,9 @@ memory_region *device_t::memregion(std::string _tag) const
memory_share *device_t::memshare(std::string _tag) const
{
// build a fully-qualified name and look it up
- if (_tag != "")
- {
- auto search = machine().memory().shares().find(subtag(_tag).c_str());
- if (search != machine().memory().shares().end())
- return search->second.get();
- else
- return nullptr;
- }
+ auto search = machine().memory().shares().find(subtag(_tag).c_str());
+ if (search != machine().memory().shares().end())
+ return search->second.get();
else
return nullptr;
}
@@ -171,14 +161,9 @@ memory_share *device_t::memshare(std::string _tag) const
memory_bank *device_t::membank(std::string _tag) const
{
- if (_tag != "")
- {
- auto search = machine().memory().banks().find(subtag(_tag).c_str());
- if (search != machine().memory().banks().end())
- return search->second.get();
- else
- return nullptr;
- }
+ auto search = machine().memory().banks().find(subtag(_tag).c_str());
+ if (search != machine().memory().banks().end())
+ return search->second.get();
else
return nullptr;
}