diff options
| author | 2016-01-20 21:35:11 +0100 | |
|---|---|---|
| committer | 2016-01-20 21:35:11 +0100 | |
| commit | 7c9cd3feea638281df93381c5a7a871d79a7ba17 (patch) | |
| tree | 1a857a2593c63a7ab3dee7eb248577701780f2e0 /src/emu/save.cpp | |
| parent | 8193c47c1925d937acc80f043ea9eadac39fd791 (diff) | |
Revert "rest of device parameters to std::string (nw)"
This reverts commit caba131d844ade3f2b30d6be24ea6cf46b2949d7.
Diffstat (limited to 'src/emu/save.cpp')
| -rw-r--r-- | src/emu/save.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/save.cpp b/src/emu/save.cpp index cee8061f43a..0a6cffd3983 100644 --- a/src/emu/save.cpp +++ b/src/emu/save.cpp @@ -146,16 +146,16 @@ void save_manager::register_postload(save_prepost_delegate func) // memory //------------------------------------------------- -void save_manager::save_memory(device_t *device, std::string module, std::string tag, UINT32 index, std::string name, void *val, UINT32 valsize, UINT32 valcount) +void save_manager::save_memory(device_t *device, const char *module, std::string tag, UINT32 index, const char *name, void *val, UINT32 valsize, UINT32 valcount) { assert(valsize == 1 || valsize == 2 || valsize == 4 || valsize == 8); // check for invalid timing if (!m_reg_allowed) { - machine().logerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module.c_str(), tag.c_str(), name.c_str()); + machine().logerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module, tag.c_str(), name); if (machine().system().flags & MACHINE_SUPPORTS_SAVE) - fatalerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module.c_str(), tag.c_str(), name.c_str()); + fatalerror("Attempt to register save state entry after state registration is closed!\nModule %s tag %s name %s\n", module, tag.c_str(), name); m_illegal_regs++; return; } @@ -163,9 +163,9 @@ void save_manager::save_memory(device_t *device, std::string module, std::string // create the full name std::string totalname; if (!tag.empty()) - strprintf(totalname, "%s/%s/%X/%s", module.c_str(), tag.c_str(), index, name.c_str()); + strprintf(totalname, "%s/%s/%X/%s", module, tag.c_str(), index, name); else - strprintf(totalname, "%s/%X/%s", module.c_str(), index, name.c_str()); + strprintf(totalname, "%s/%X/%s", module, index, name); // look for duplicates and an entry to insert in front of state_entry *insert_after = nullptr; @@ -182,7 +182,7 @@ void save_manager::save_memory(device_t *device, std::string module, std::string } // insert us into the list - m_entry_list.insert_after(*global_alloc(state_entry(val, totalname.c_str(), device, module.c_str(), tag, index, valsize, valcount)), insert_after); + m_entry_list.insert_after(*global_alloc(state_entry(val, totalname.c_str(), device, module, tag, index, valsize, valcount)), insert_after); } @@ -418,7 +418,7 @@ save_manager::state_callback::state_callback(save_prepost_delegate callback) // state_entry - constructor //------------------------------------------------- -state_entry::state_entry(void *data, std::string name, device_t *device, std::string module, std::string tag, int index, UINT8 size, UINT32 count) +state_entry::state_entry(void *data, const char *name, device_t *device, const char *module, std::string tag, int index, UINT8 size, UINT32 count) : m_next(nullptr), m_data(data), m_name(name), |
