X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=67f932fbafe9fa29fc06d0a0637027badb42e8a4;hb=1ec533a7777be4dce9c8b6bbb1cbc32d38098ae4;hp=3e862ecf0b7c221bf0ee4e5a160266da6b6e7356;hpb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;p=builder.git diff --git a/source/config.cpp b/source/config.cpp index 3e862ec..67f932f 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -19,18 +19,18 @@ Config::Config(SourcePackage &p): 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)