X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=a49624d13201d6eb8d9112f6653c1546909cf85f;hb=c3968651eb8a2ba66a95398f0571dd5afd37225c;hp=ceb7db3581f7db02915b8433fdfda56532657811;hpb=690b9c5f340504517cf6ba8aad0c168dcdff4efa;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index ceb7db3..a49624d 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -324,7 +324,7 @@ void Builder::Loader::build_type(const string &n)
 {
 	BuildType btype(n);
 	load_sub(btype);
-	auto i = obj.build_types.insert(BuildTypeMap::value_type(n, btype)).first;
+	auto i = obj.build_types.insert({ n, btype }).first;
 	if(!obj.build_type)
 		obj.build_type = &i->second;
 }
@@ -333,10 +333,7 @@ void Builder::Loader::package(const string &n)
 {
 	SourcePackage *pkg = new SourcePackage(obj, n, get_source());
 
-	if(options)
-		load_sub(*pkg, *options);
-	else
-		load_sub(*pkg);
+	load_sub(*pkg, options);
 
 	if(obj.build_type)
 		pkg->set_build_type(*obj.build_type);