summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/cbm_crt.c
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
committer ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
commitcc3b682e52bf097d31db78032aad01d6a0b12e94 (patch)
tree860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/lib/formats/cbm_crt.c
parent7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff)
parenta649a95488e1fc85813dda747dc74c596496bd1c (diff)
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/lib/formats/cbm_crt.c')
-rw-r--r--src/lib/formats/cbm_crt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/formats/cbm_crt.c b/src/lib/formats/cbm_crt.c
index 3be90b29ab1..dce20d6e603 100644
--- a/src/lib/formats/cbm_crt.c
+++ b/src/lib/formats/cbm_crt.c
@@ -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(astring &result, core_file *file)
+void cbm_crt_get_card(std::string &result, core_file *file)
{
// read the header
cbm_crt_header header;
@@ -132,11 +132,11 @@ void cbm_crt_get_card(astring &result, core_file *file)
{
UINT16 hardware = pick_integer_be(header.hardware, 0, 2);
- result.cpy(CRT_C64_SLOT_NAMES[hardware]);
+ result.assign(CRT_C64_SLOT_NAMES[hardware]);
return;
}
- result.reset();
+ result.clear();
}