From 115db95642ad6d861aad63775b92350e0491f2dd Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 10 Jan 2016 16:36:18 -0500 Subject: Return std::string objects by value rather than pass by reference - strprintf is unaltered, but strformat now takes one fewer argument - state_string_export still fills a buffer, but has been made const - get_default_card_software now takes no arguments but returns a string --- src/devices/bus/crvision/slot.cpp | 7 +++---- src/devices/bus/crvision/slot.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/devices/bus/crvision') diff --git a/src/devices/bus/crvision/slot.cpp b/src/devices/bus/crvision/slot.cpp index 5953c1c5cb6..47173a1cf5d 100644 --- a/src/devices/bus/crvision/slot.cpp +++ b/src/devices/bus/crvision/slot.cpp @@ -229,7 +229,7 @@ bool crvision_cart_slot_device::call_softlist_load(software_list_device &swlist, get default card software -------------------------------------------------*/ -void crvision_cart_slot_device::get_default_card_software(std::string &result) +std::string crvision_cart_slot_device::get_default_card_software() { if (open_image_file(mconfig().options())) { @@ -267,11 +267,10 @@ void crvision_cart_slot_device::get_default_card_software(std::string &result) //printf("type: %s\n", slot_string); clear(); - result.assign(slot_string); - return; + return std::string(slot_string); } - software_get_default_slot(result, "crv_rom4k"); + return software_get_default_slot("crv_rom4k"); } /*------------------------------------------------- diff --git a/src/devices/bus/crvision/slot.h b/src/devices/bus/crvision/slot.h index b6da6c165df..d3bb02d6790 100644 --- a/src/devices/bus/crvision/slot.h +++ b/src/devices/bus/crvision/slot.h @@ -78,7 +78,7 @@ public: virtual const char *file_extensions() const override { return "bin,rom"; } // slot interface overrides - virtual void get_default_card_software(std::string &result) override; + virtual std::string get_default_card_software() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom40); -- cgit v1.2.3-70-g09d2