From a620ba26cd58f3cb3af503597fcdfd365a18ecf4 Mon Sep 17 00:00:00 2001 From: Nathan Woods Date: Tue, 5 Jul 2016 21:36:04 -0400 Subject: [PATCH] Converted properties on image_device_format to return 'const std::string &' instead of 'const char *' --- src/emu/diimage.cpp | 2 +- src/emu/diimage.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index ebf7804fbad..172edc2cbb7 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -198,7 +198,7 @@ image_error_t device_image_interface::set_image_filename(const char *filename) const image_device_format *device_image_interface::device_get_named_creatable_format(const char *format_name) { for (auto &format : m_formatlist) - if (strcmp(format->name(), format_name) == 0) + if (strcmp(format->name().c_str(), format_name) == 0) return format.get(); return nullptr; } diff --git a/src/emu/diimage.h b/src/emu/diimage.h index 841b564b845..92d87fc6b87 100644 --- a/src/emu/diimage.h +++ b/src/emu/diimage.h @@ -78,10 +78,10 @@ public: m_extensions(extensions), m_optspec(optspec) { } - const char *name() const { return m_name.c_str(); } - const char *description() const { return m_description.c_str(); } - const char *extensions() const { return m_extensions.c_str(); } - const char *optspec() const { return m_optspec.c_str(); } + const std::string &name() const { return m_name; } + const std::string &description() const { return m_description; } + const std::string &extensions() const { return m_extensions; } + const std::string &optspec() const { return m_optspec; } private: std::string m_name;