diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-03-24 01:24:07 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-03-24 01:27:44 -0700 |
| commit | d5580dd330bac4d473f146e6efe3756e83a35066 (patch) | |
| tree | 4e7a911ea5e976b8463a71dd61783041f450de82 | |
| parent | 69dfad795f4ffb5bec60602ec1116730027ff088 (diff) | |
| download | vcpkg-d5580dd330bac4d473f146e6efe3756e83a35066.tar.gz vcpkg-d5580dd330bac4d473f146e6efe3756e83a35066.zip | |
Join declaration and assignment
| -rw-r--r-- | toolsrc/src/vcpkg/install.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index e30a34c18..7a963c82f 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -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) { |