X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackagemanager.cpp;h=af672d9710fd175db235bf9be11d2ba730ef20b8;hb=1ec533a7777be4dce9c8b6bbb1cbc32d38098ae4;hp=f54606f42f1639e09b0e91e11a2b02ecbfd15593;hpb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;p=builder.git

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index f54606f..af672d9 100644
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -47,7 +47,7 @@ void PackageManager::set_no_externals(bool x)
 
 void PackageManager::add_package(Package *pkg)
 {
-	PackageMap::iterator i = packages.find(pkg->get_name());
+	auto i = packages.find(pkg->get_name());
 	if(i!=packages.end())
 	{
 		if(i->second!=pkg)
@@ -59,12 +59,12 @@ void PackageManager::add_package(Package *pkg)
 	if(packages.empty())
 		main_pkg = pkg;
 
-	packages.insert(PackageMap::value_type(pkg->get_name(), pkg));
+	packages.insert({ pkg->get_name(), pkg });
 }
 
 Package *PackageManager::get_package(const string &name) const
 {
-	PackageMap::const_iterator i = packages.find(name);
+	auto i = packages.find(name);
 	if(i!=packages.end())
 		return i->second;
 
@@ -92,7 +92,7 @@ Package *PackageManager::find_package(const string &name)
 		if(!path.empty())
 		{
 			builder.load_build_file(path/"Build");
-			PackageMap::iterator i = packages.find(name);
+			auto i = packages.find(name);
 			if(i!=packages.end())
 				return i->second;
 		}
@@ -114,7 +114,7 @@ Package *PackageManager::find_package(const string &name)
 		flags_str = run_pkgconfig(name, "staticflags");
 		BinaryPackage::Flags static_flags = split(flags_str);
 		Package *pkg = BinaryPackage::from_flags(builder, name, flags, static_flags);
-		packages.insert(PackageMap::value_type(name, pkg));
+		packages.insert({ name, pkg });
 		return pkg;
 	}
 	catch(...)