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/memory.h | |
parent | 7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff) | |
parent | a649a95488e1fc85813dda747dc74c596496bd1c (diff) |
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/emu/memory.h')
-rw-r--r-- | src/emu/memory.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/memory.h b/src/emu/memory.h index fff49dd6d0c..7503301453e 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -626,9 +626,9 @@ private: offs_t m_bytestart; // byte-adjusted start offset offs_t m_byteend; // byte-adjusted end offset int m_curentry; // current entry - std::vector<bank_entry> m_entry; // array of entries (dynamically allocated) - astring m_name; // friendly name for this bank - astring m_tag; // tag for this bank + std::vector<bank_entry> m_entry; // array of entries (dynamically allocated) + std::string m_name; // friendly name for this bank + std::string m_tag; // tag for this bank simple_list<bank_reference> m_reflist; // linked list of address spaces referencing this bank }; @@ -712,7 +712,7 @@ private: // internal data running_machine & m_machine; memory_region * m_next; - astring m_name; + std::string m_name; dynamic_buffer m_buffer; endianness_t m_endianness; UINT8 m_bitwidth; |