From 6350eddd4689568ff8dcfe431e1bf81579fb0556 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 18 Apr 2017 15:31:10 -0700 Subject: Find group_by_plan_type outside of print_plan() --- toolsrc/src/commands_remove.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'toolsrc/src/commands_remove.cpp') diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index f26cf5dbf..225241bdf 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -87,13 +87,10 @@ namespace vcpkg::Commands::Remove write_update(paths, pkg); } - static void print_plan(const std::vector& plan) + static void print_plan(const std::map>& group_by_plan_type) { static constexpr std::array order = { RemovePlanType::NOT_INSTALLED, RemovePlanType::REMOVE }; - std::map> group_by_plan_type; - Util::group_by(plan, &group_by_plan_type, [](const RemovePlanAction& p) { return p.plan_type; }); - for (const RemovePlanType plan_type : order) { auto it = group_by_plan_type.find(plan_type); @@ -162,7 +159,9 @@ namespace vcpkg::Commands::Remove const std::vector remove_plan = Dependencies::create_remove_plan(specs, status_db); Checks::check_exit(VCPKG_LINE_INFO, !remove_plan.empty(), "Remove plan cannot be empty"); - print_plan(remove_plan); + std::map> group_by_plan_type; + Util::group_by(remove_plan, &group_by_plan_type, [](const RemovePlanAction& p) { return p.plan_type; }); + print_plan(group_by_plan_type); const bool has_non_user_requested_packages = Util::find_if(remove_plan, [](const RemovePlanAction& package)-> bool { -- cgit v1.2.3