diff options
author | 2015-05-02 19:41:03 +0200 | |
---|---|---|
committer | 2015-05-02 19:41:03 +0200 | |
commit | cc3b682e52bf097d31db78032aad01d6a0b12e94 (patch) | |
tree | 860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/osd/sdl/input.c | |
parent | 7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff) | |
parent | a649a95488e1fc85813dda747dc74c596496bd1c (diff) |
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/osd/sdl/input.c')
-rw-r--r-- | src/osd/sdl/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/sdl/input.c b/src/osd/sdl/input.c index 5fab6a71fde..42fc08a8ebd 100644 --- a/src/osd/sdl/input.c +++ b/src/osd/sdl/input.c @@ -132,7 +132,7 @@ struct device_info // device information device_info ** head; device_info * next; - astring name; + std::string name; // MAME information input_device * device; @@ -2231,7 +2231,7 @@ static device_info *generic_device_alloc(device_info **devlist_head_ptr, const c devinfo->head = devlist_head_ptr; // allocate a UTF8 copy of the name - devinfo->name.cpy(name); + devinfo->name.assign(name); // append us to the list for (curdev_ptr = devinfo->head; *curdev_ptr != NULL; curdev_ptr = &(*curdev_ptr)->next) ; |