diff options
| -rw-r--r-- | toolsrc/include/vcpkg_cmd_arguments.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_create.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_edit.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_installation.cpp | 4 | ||||
| -rw-r--r-- | toolsrc/src/commands_remove.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_cmd_arguments.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/toolsrc/include/vcpkg_cmd_arguments.h b/toolsrc/include/vcpkg_cmd_arguments.h index 704290589..7df3d64b1 100644 --- a/toolsrc/include/vcpkg_cmd_arguments.h +++ b/toolsrc/include/vcpkg_cmd_arguments.h @@ -27,7 +27,7 @@ namespace vcpkg std::unordered_set<std::string> check_and_get_optional_command_arguments(const std::vector<std::string>& valid_options) const; void check_max_args(size_t arg_count, const char* example_text = nullptr) const; - std::vector<package_spec> parse_all_arguments_as_package_specs(const vcpkg_paths& paths, const triplet& default_target_triplet, const char* example_text = nullptr) const; + std::vector<package_spec> parse_all_arguments_as_package_specs(const triplet& default_target_triplet, const char* example_text = nullptr) const; private: std::unordered_set<std::string> optional_command_arguments; diff --git a/toolsrc/src/commands_create.cpp b/toolsrc/src/commands_create.cpp index 8ae67b799..73d163af8 100644 --- a/toolsrc/src/commands_create.cpp +++ b/toolsrc/src/commands_create.cpp @@ -7,7 +7,7 @@ namespace vcpkg void create_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet) { args.check_max_args(3); - package_spec spec = args.parse_all_arguments_as_package_specs(paths, default_target_triplet).at(0); + package_spec spec = args.parse_all_arguments_as_package_specs(default_target_triplet).at(0); if (args.command_arguments.size() < 2) { System::println(System::color::error, "Error: create requires the archive's URL as the second argument."); diff --git a/toolsrc/src/commands_edit.cpp b/toolsrc/src/commands_edit.cpp index 2272c1277..71ae8b2c8 100644 --- a/toolsrc/src/commands_edit.cpp +++ b/toolsrc/src/commands_edit.cpp @@ -7,7 +7,7 @@ namespace vcpkg { static auto example = "edit zlib"; args.check_max_args(1, example); - package_spec spec = args.parse_all_arguments_as_package_specs(paths, default_target_triplet, example).at(0); + package_spec spec = args.parse_all_arguments_as_package_specs(default_target_triplet, example).at(0); // Find editor std::wstring env_EDITOR = System::wdupenv_str(L"EDITOR"); diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp index 3765a9a23..49047d074 100644 --- a/toolsrc/src/commands_installation.cpp +++ b/toolsrc/src/commands_installation.cpp @@ -60,7 +60,7 @@ namespace vcpkg { StatusParagraphs status_db = database_load_check(paths); - std::vector<package_spec> specs = args.parse_all_arguments_as_package_specs(paths, default_target_triplet); + std::vector<package_spec> specs = args.parse_all_arguments_as_package_specs(default_target_triplet); std::vector<package_spec> install_plan = Dependencies::create_dependency_ordered_install_plan(paths, specs, status_db); Checks::check_exit(!install_plan.empty(), "Install plan cannot be empty"); std::string specs_string = to_string(install_plan[0]); @@ -119,7 +119,7 @@ namespace vcpkg StatusParagraphs status_db = database_load_check(paths); - const package_spec spec = args.parse_all_arguments_as_package_specs(paths, default_target_triplet).at(0); + const package_spec spec = args.parse_all_arguments_as_package_specs(default_target_triplet).at(0); std::unordered_set<package_spec> unmet_dependencies = Dependencies::find_unmet_dependencies(paths, spec, status_db); if (!unmet_dependencies.empty()) { diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index 0b00e10f6..f5315ccb1 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -25,7 +25,7 @@ namespace vcpkg const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({OPTION_PURGE}); auto status_db = database_load_check(paths); - std::vector<package_spec> specs = args.parse_all_arguments_as_package_specs(paths, default_target_triplet); + std::vector<package_spec> specs = args.parse_all_arguments_as_package_specs(default_target_triplet); bool alsoRemoveFolderFromPackages = options.find(OPTION_PURGE) != options.end(); for (const package_spec& spec : specs) diff --git a/toolsrc/src/vcpkg_cmd_arguments.cpp b/toolsrc/src/vcpkg_cmd_arguments.cpp index 9181342d0..3605503b0 100644 --- a/toolsrc/src/vcpkg_cmd_arguments.cpp +++ b/toolsrc/src/vcpkg_cmd_arguments.cpp @@ -179,7 +179,7 @@ namespace vcpkg } } - std::vector<package_spec> vcpkg_cmd_arguments::parse_all_arguments_as_package_specs(const vcpkg_paths& paths, const triplet& default_target_triplet, const char* example_text) const + std::vector<package_spec> vcpkg_cmd_arguments::parse_all_arguments_as_package_specs(const triplet& default_target_triplet, const char* example_text) const { size_t arg_count = command_arguments.size(); if (arg_count < 1) |