Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 01:48:29 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

Fix main fallout (nw)

Browse Source
This commit is contained in:
Olivier Galibert 2018-08-26 23:02:53 +02:00
parent 96e9313016
commit badc06d1f5
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/emu/device.cpp
View File

@ -130,14 +130,9 @@ device_t::~device_t()
memory_region *device_t::memregion(std::string _tag) const memory_region *device_t::memregion(std::string _tag) const
{ {
// build a fully-qualified name and look it up // 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())
auto search = machine().memory().regions().find(subtag(_tag).c_str()); return search->second.get();
if (search != machine().memory().regions().end())
return search->second.get();
else
return nullptr;
}
else else
return nullptr; return nullptr;
} }
@ -151,14 +146,9 @@ memory_region *device_t::memregion(std::string _tag) const
memory_share *device_t::memshare(std::string _tag) const memory_share *device_t::memshare(std::string _tag) const
{ {
// build a fully-qualified name and look it up // 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())
auto search = machine().memory().shares().find(subtag(_tag).c_str()); return search->second.get();
if (search != machine().memory().shares().end())
return search->second.get();
else
return nullptr;
}
else else
return nullptr; return nullptr;
} }
@ -171,14 +161,9 @@ memory_share *device_t::memshare(std::string _tag) const
memory_bank *device_t::membank(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())
auto search = machine().memory().banks().find(subtag(_tag).c_str()); return search->second.get();
if (search != machine().memory().banks().end())
return search->second.get();
else
return nullptr;
}
else else
return nullptr; return nullptr;
} }