Join declaration and assignment

This commit is contained in:
Alexander Karatarakis 2018-03-24 01:24:07 -07:00
parent 69dfad795f
commit d5580dd330

View File

@ -558,16 +558,15 @@ namespace vcpkg::Install
Build::CleanBuildtrees::NO,
Build::CleanPackages::NO};
// Note: action_plan will hold raw pointers to SourceControlFiles from this map
std::vector<AnyAction> action_plan;
auto all_ports = Paragraphs::load_all_ports(paths.get_filesystem(), paths.ports);
std::unordered_map<std::string, SourceControlFile> scf_map;
for (auto&& port : all_ports)
scf_map[port->core_paragraph->name] = std::move(*port);
MapPortFileProvider provider(scf_map);
action_plan = create_feature_install_plan(provider, FullPackageSpec::to_feature_specs(specs), status_db);
// Note: action_plan will hold raw pointers to SourceControlFiles from this map
std::vector<AnyAction> action_plan =
create_feature_install_plan(provider, FullPackageSpec::to_feature_specs(specs), status_db);
if (!GlobalState::feature_packages)
{