const Config::Option &Config::add_option(const Feature &f)
{
Option opt(f);
- InputOptions::const_iterator i = pending_options.find(opt.name);
+ auto i = pending_options.find(opt.name);
if(i!=pending_options.end())
opt.value = i->second;
- return options.insert(OptionMap::value_type(opt.name, opt)).first->second;
+ return options.insert({ opt.name, opt }).first->second;
}
bool Config::set_option(const string &opt, const string &val)
{
bool result = false;
- OptionMap::iterator i = options.find(opt);
+ auto i = options.find(opt);
if(i!=options.end())
{
if(i->second.value!=val)