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/machine/ram.c | |
parent | 7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff) | |
parent | a649a95488e1fc85813dda747dc74c596496bd1c (diff) |
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/emu/machine/ram.c')
-rw-r--r-- | src/emu/machine/ram.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/machine/ram.c b/src/emu/machine/ram.c index 47d53a48082..6f5d3c4ec27 100644 --- a/src/emu/machine/ram.c +++ b/src/emu/machine/ram.c @@ -154,21 +154,21 @@ void ram_device::device_validity_check(validity_checker &valid) const if (!is_valid) { - astring output; - output.catprintf("Cannot recognize the RAM option %s", ramsize_string); - output.catprintf(" (valid options are %s", m_default_size); + std::string output; + strcatprintf(output, "Cannot recognize the RAM option %s", ramsize_string); + strcatprintf(output, " (valid options are %s", m_default_size); if (m_extra_options != NULL) - output.catprintf(",%s).\n", m_extra_options); + strcatprintf(output, ",%s).\n", m_extra_options); else - output.catprintf(").\n"); + strcatprintf(output, ").\n"); osd_printf_error("%s", output.c_str()); osd_printf_warning("Setting value to default %s\n",m_default_size); - astring error; + std::string error; mconfig().options().set_value(OPTION_RAMSIZE, m_default_size, OPTION_PRIORITY_CMDLINE, error); - assert(!error); + assert(error.empty()); } } |