From cdc77fdae4c6084a2650757c95ee4497f484fa83 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 6 Apr 2017 17:37:19 -0700 Subject: RemovePlan -> sort by name --- toolsrc/src/commands_remove.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'toolsrc/src/commands_remove.cpp') diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index cd8f81f92..b57137b56 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -101,14 +101,6 @@ namespace vcpkg::Commands::Remove write_update(paths, pkg); } - static void sort_packages_by_name(std::vector* packages) - { - std::sort(packages->begin(), packages->end(), [](const PackageSpecWithRemovePlan* left, const PackageSpecWithRemovePlan* right) -> bool - { - return left->spec.name() < right->spec.name(); - }); - } - static void print_plan(const std::vector& plan) { std::vector not_installed; @@ -131,7 +123,7 @@ namespace vcpkg::Commands::Remove if (!not_installed.empty()) { - sort_packages_by_name(¬_installed); + std::sort(not_installed.begin(), not_installed.end(), &PackageSpecWithRemovePlan::compare_by_name); System::println("The following packages are not installed, so not removed:\n%s", Strings::join("\n ", not_installed, [](const PackageSpecWithRemovePlan* p) { @@ -141,7 +133,7 @@ namespace vcpkg::Commands::Remove if (!remove.empty()) { - sort_packages_by_name(&remove); + std::sort(remove.begin(), remove.end(), &PackageSpecWithRemovePlan::compare_by_name); System::println("The following packages will be removed:\n%s", Strings::join("\n", remove, [](const PackageSpecWithRemovePlan* p) { -- cgit v1.2.3