diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-14 16:01:19 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-14 16:01:19 -0700 |
| commit | 1c08a42091cb0addd1e0c1daf27d24bf4e9d237f (patch) | |
| tree | f8c69e701dfae791fe180a8c24b35a4195668afd /toolsrc/src/vcpkg_Dependencies.cpp | |
| parent | 23366aede0cb1ccfeac85a28308bc722811b18bc (diff) | |
| parent | b3541eff15847b2cc90736a609b8c6f99ce74a9d (diff) | |
| download | vcpkg-1c08a42091cb0addd1e0c1daf27d24bf4e9d237f.tar.gz vcpkg-1c08a42091cb0addd1e0c1daf27d24bf4e9d237f.zip | |
Merge from master
Diffstat (limited to 'toolsrc/src/vcpkg_Dependencies.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg_Dependencies.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp index 03e3c2aeb..151ee28f4 100644 --- a/toolsrc/src/vcpkg_Dependencies.cpp +++ b/toolsrc/src/vcpkg_Dependencies.cpp @@ -143,10 +143,10 @@ namespace vcpkg::Dependencies const std::unordered_set<PackageSpec> specs_as_set(specs.cbegin(), specs.cend()); std::vector<InstallPlanAction> toposort = Graphs::topological_sort(specs, InstallAdjacencyProvider{ paths, status_db, specs_as_set }); - Util::keep_if(toposort, [](const InstallPlanAction& p) - { - return !(p.request_type == RequestType::AUTO_SELECTED && p.plan_type == InstallPlanType::ALREADY_INSTALLED); - }); + Util::erase_remove_if(toposort, [](const InstallPlanAction& p) + { + return p.request_type == RequestType::AUTO_SELECTED && p.plan_type == InstallPlanType::ALREADY_INSTALLED; + }); return toposort; } |