From 18fa18a07b97aa69826562738e498fbd2317e091 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:17:54 -0700 Subject: Remove PackageSpec.display_name() --- toolsrc/src/commands_remove.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolsrc/src/commands_remove.cpp') diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index 8bf2c767b..7899980e5 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -200,7 +200,7 @@ namespace vcpkg::Commands::Remove for (const PackageSpecWithRemovePlan& action : remove_plan) { - const std::string display_name = action.spec.display_name(); + const std::string display_name = action.spec.to_string(); switch (action.plan.plan_type) { -- cgit v1.2.3 From 410aa5b43a5fa995d8684590b119bbb04353a139 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:00:33 -0700 Subject: default_target_triplet -> default_triplet --- toolsrc/src/commands_remove.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolsrc/src/commands_remove.cpp') diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index 7899980e5..7f616dd95 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -136,7 +136,7 @@ namespace vcpkg::Commands::Remove } } - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet) + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet) { static const std::string OPTION_PURGE = "--purge"; static const std::string OPTION_NO_PURGE = "--no-purge"; @@ -156,7 +156,7 @@ namespace vcpkg::Commands::Remove else { args.check_min_arg_count(1, example); - specs = Util::fmap(args.command_arguments, [&](auto&& arg) { return Input::check_and_get_package_spec(arg, default_target_triplet, example); }); + specs = Util::fmap(args.command_arguments, [&](auto&& arg) { return Input::check_and_get_package_spec(arg, default_triplet, example); }); for (auto&& spec : specs) Input::check_triplet(spec.target_triplet(), paths); } -- cgit v1.2.3 From 3e94a8db42804a6ac0cc71e5b74483ebd5958f83 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:03:34 -0700 Subject: PackageSpec.target_triplet() -> ".triplet() --- toolsrc/src/commands_remove.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolsrc/src/commands_remove.cpp') diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index 7f616dd95..b26fec36f 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -29,7 +29,7 @@ namespace vcpkg::Commands::Remove static void remove_package(const VcpkgPaths& paths, const PackageSpec& spec, StatusParagraphs* status_db) { - StatusParagraph& pkg = **status_db->find(spec.name(), spec.target_triplet()); + StatusParagraph& pkg = **status_db->find(spec.name(), spec.triplet()); pkg.want = Want::PURGE; pkg.state = InstallState::HALF_INSTALLED; @@ -158,7 +158,7 @@ namespace vcpkg::Commands::Remove args.check_min_arg_count(1, example); specs = Util::fmap(args.command_arguments, [&](auto&& arg) { return Input::check_and_get_package_spec(arg, default_triplet, example); }); for (auto&& spec : specs) - Input::check_triplet(spec.target_triplet(), paths); + Input::check_triplet(spec.triplet(), paths); } const bool alsoRemoveFolderFromPackages = options.find(OPTION_NO_PURGE) == options.end(); -- cgit v1.2.3