summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/addrmap.c
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
committer ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
commitcc3b682e52bf097d31db78032aad01d6a0b12e94 (patch)
tree860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/emu/addrmap.c
parent7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff)
parenta649a95488e1fc85813dda747dc74c596496bd1c (diff)
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/emu/addrmap.c')
-rw-r--r--src/emu/addrmap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/emu/addrmap.c b/src/emu/addrmap.c
index 4453da2668f..83bcbaaadac 100644
--- a/src/emu/addrmap.c
+++ b/src/emu/addrmap.c
@@ -490,8 +490,7 @@ void address_map::uplift_submaps(running_machine &machine, device_t &device, dev
{
if (entry->m_read.m_type == AMH_DEVICE_SUBMAP)
{
- astring tag;
- owner.subtag(tag, entry->m_read.m_tag);
+ std::string tag = owner.subtag(entry->m_read.m_tag);
device_t *mapdevice = machine.device(tag.c_str());
if (mapdevice == NULL) {
throw emu_fatalerror("Attempted to submap a non-existent device '%s' in space %d of device '%s'\n", tag.c_str(), m_spacenum, device.basetag());