summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/corefile.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-01-27 08:35:08 +0100
committer ImJezze <jezze@gmx.net>2016-01-27 08:35:08 +0100
commit0d1e14b771ed72d8e9a0d42fd05ebfe6fe63016a (patch)
tree10258b6f255e00e7eec2ec30112d6de07015c475 /src/lib/util/corefile.cpp
parent8d5848718c30a960d07d569937cb1678f75f0463 (diff)
parentb1d6f6d63f8294a3f62d7db6f9eea07da1d93664 (diff)
Merge pull request #10 from mamedev/master
Sync to base master
Diffstat (limited to 'src/lib/util/corefile.cpp')
-rw-r--r--src/lib/util/corefile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/util/corefile.cpp b/src/lib/util/corefile.cpp
index a2242c133c6..344a2922bfe 100644
--- a/src/lib/util/corefile.cpp
+++ b/src/lib/util/corefile.cpp
@@ -909,7 +909,7 @@ file_error core_truncate(core_file *f, UINT64 offset)
assumptions about path separators
-------------------------------------------------*/
-std::string &core_filename_extract_base(std::string &result, const char *name, bool strip_extension)
+std::string core_filename_extract_base(const char *name, bool strip_extension)
{
/* find the start of the name */
const char *start = name + strlen(name);
@@ -917,7 +917,7 @@ std::string &core_filename_extract_base(std::string &result, const char *name, b
start--;
/* copy the rest into an astring */
- result.assign(start);
+ std::string result(start);
/* chop the extension if present */
if (strip_extension)