diff options
author | 2016-01-27 08:35:08 +0100 | |
---|---|---|
committer | 2016-01-27 08:35:08 +0100 | |
commit | 0d1e14b771ed72d8e9a0d42fd05ebfe6fe63016a (patch) | |
tree | 10258b6f255e00e7eec2ec30112d6de07015c475 /src/lib/formats/cbm_crt.cpp | |
parent | 8d5848718c30a960d07d569937cb1678f75f0463 (diff) | |
parent | b1d6f6d63f8294a3f62d7db6f9eea07da1d93664 (diff) |
Merge pull request #10 from mamedev/master
Sync to base master
Diffstat (limited to 'src/lib/formats/cbm_crt.cpp')
-rw-r--r-- | src/lib/formats/cbm_crt.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/formats/cbm_crt.cpp b/src/lib/formats/cbm_crt.cpp index d169d0c2fd7..6484dbf108c 100644 --- a/src/lib/formats/cbm_crt.cpp +++ b/src/lib/formats/cbm_crt.cpp @@ -122,7 +122,7 @@ static const char * CRT_C64_SLOT_NAMES[_CRT_C64_COUNT] = // cbm_crt_get_card - get slot interface card //------------------------------------------------- -void cbm_crt_get_card(std::string &result, core_file *file) +std::string cbm_crt_get_card(core_file *file) { // read the header cbm_crt_header header; @@ -132,11 +132,10 @@ void cbm_crt_get_card(std::string &result, core_file *file) { UINT16 hardware = pick_integer_be(header.hardware, 0, 2); - result.assign(CRT_C64_SLOT_NAMES[hardware]); - return; + return std::string(CRT_C64_SLOT_NAMES[hardware]); } - result.clear(); + return std::string(); } |