summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/memory.h
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-04-12 08:05:15 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-04-12 08:05:43 +0200
commit7faba31b1b8dcd6caa5f1b651d2693106de08d35 (patch)
treec528d5479eee247ee5305df53a298a09b594fccc /src/emu/memory.h
parent15a464dac99052edc0645374a77ecef8d1a65b0d (diff)
There is no implicit conversion to char* in std::string (nw)
Diffstat (limited to 'src/emu/memory.h')
-rw-r--r--src/emu/memory.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/memory.h b/src/emu/memory.h
index e90cc58394c..128538e0735 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -587,8 +587,8 @@ public:
offs_t bytestart() const { return m_bytestart; }
void *base() const { return *m_baseptr; }
void *base_decrypted() const { return *m_basedptr; }
- const char *tag() const { return m_tag; }
- const char *name() const { return m_name; }
+ const char *tag() const { return m_tag.c_str(); }
+ const char *name() const { return m_name.c_str(); }
// compare a range against our range
bool matches_exactly(offs_t bytestart, offs_t byteend) const { return (m_bytestart == bytestart && m_byteend == byteend); }
@@ -695,7 +695,7 @@ public:
UINT8 *base() { return (this != NULL) ? &m_buffer[0] : NULL; }
UINT8 *end() { return (this != NULL) ? base() + m_buffer.count() : NULL; }
UINT32 bytes() const { return (this != NULL) ? m_buffer.count() : 0; }
- const char *name() const { return m_name; }
+ const char *name() const { return m_name.c_str(); }
// flag expansion
endianness_t endianness() const { return m_endianness; }