зеркало из https://github.com/microsoft/vcpkg.git
Fixed errors introduced during merge
This commit is contained in:
Родитель
430f53af7d
Коммит
3495f094bc
|
@ -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(default_target_triplet);
|
||||
std::vector<package_spec> specs = args.parse_all_arguments_as_package_specs(paths, 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]);
|
||||
|
|
|
@ -179,7 +179,7 @@ namespace vcpkg
|
|||
}
|
||||
}
|
||||
|
||||
std::vector<package_spec> vcpkg_cmd_arguments::parse_all_arguments_as_package_specs(const vcpkg_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 vcpkg_paths& paths, const triplet& default_target_triplet, const char* example_text) const
|
||||
{
|
||||
size_t arg_count = command_arguments.size();
|
||||
if (arg_count < 1)
|
||||
|
|
Загрузка…
Ссылка в новой задаче