X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=67f932fbafe9fa29fc06d0a0637027badb42e8a4;hb=eadb72197ef2fde2a44914067277054c59b67161;hp=36e7870683b3bfed9e1474306ee8adde2ce13a84;hpb=c7df14c38a87ceca13df47fa700d3f9fa250be91;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 36e7870..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)
@@ -82,8 +82,8 @@ void Config::save() const
 	package.get_builder().get_logger().log("files", format("Writing %s", fn));
 	IO::BufferedFile out(fn.str(), IO::M_WRITE);
 
-	for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
-		IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
+	for(const auto &kvp: options)
+		IO::print(out, "option \"%s\" \"%s\";\n", kvp.second.name, kvp.second.value);
 
 	changed = false;
 }