diff options
author | 2015-05-02 19:41:03 +0200 | |
---|---|---|
committer | 2015-05-02 19:41:03 +0200 | |
commit | cc3b682e52bf097d31db78032aad01d6a0b12e94 (patch) | |
tree | 860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/emu/dislot.c | |
parent | 7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff) | |
parent | a649a95488e1fc85813dda747dc74c596496bd1c (diff) |
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/emu/dislot.c')
-rw-r--r-- | src/emu/dislot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emu/dislot.c b/src/emu/dislot.c index 22fc5c903f9..e0c07d206f1 100644 --- a/src/emu/dislot.c +++ b/src/emu/dislot.c @@ -64,7 +64,7 @@ device_t* device_slot_interface::get_card_device() { const char *subtag; device_t *dev = NULL; - astring temp; + std::string temp; if (!device().mconfig().options().exists(device().tag()+1)) { subtag = m_default_option; } else { |