Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-26 02:07:14 +03:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Enabled default move ctor/assignments in core_options, and changed

Browse Source 
plugin_options code to use them
This commit is contained in:
npwoods 2019-08-01 08:39:56 -04:00
parent 01cbf5a1eb
commit 6a15fe5d73
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontend/mame/pluginopts.cpp
View File

@ -125,7 +125,7 @@ plugin *plugin_options::find(const std::string &name)
// create_core_options
//-------------------------------------------------
static void create_core_options(core_options &opts, const plugin_options &plugin_opts)
static core_options create_core_options(const plugin_options &plugin_opts)
{
// we're sort of abusing core_options to just get INI file parsing, so we'll build a
// core_options structure for the sole purpose of parsing an INI file, and then reflect
@ -135,6 +135,8 @@ static void create_core_options(core_options &opts, const plugin_options &plugin
{ nullptr, nullptr, OPTION_HEADER, "PLUGINS OPTIONS" },
{ nullptr }
};
core_options opts;
opts.add_entries(s_option_entries);
// create an entry for each option
@ -146,6 +148,8 @@ static void create_core_options(core_options &opts, const plugin_options &plugin
core_options::option_type::BOOLEAN,
p.m_start ? "1" : "0");
}
return opts;
}
@ -155,8 +159,7 @@ static void create_core_options(core_options &opts, const plugin_options &plugin
void plugin_options::parse_ini_file(util::core_file &inifile)
{
core_options opts;
create_core_options(opts, *this);
core_options opts = create_core_options(*this);
// parse the INI file
opts.parse_ini_file(inifile, OPTION_PRIORITY_NORMAL, true, true);
@ -173,7 +176,6 @@ void plugin_options::parse_ini_file(util::core_file &inifile)
std::string plugin_options::output_ini() const
{
core_options opts;
create_core_options(opts, *this);
core_options opts = create_core_options(*this);
return opts.output_ini();
}

4
src/lib/util/options.h
View File

@ -148,9 +148,9 @@ public:
// construction/destruction
core_options();
core_options(const core_options &) = delete;
core_options(core_options &&) = delete;
core_options(core_options &&) = default;
core_options& operator=(const core_options &) = delete;
core_options& operator=(core_options &&) = delete;
core_options& operator=(core_options &&) = default;
virtual ~core_options();
// getters