diff options
| author | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2016-09-23 10:06:45 +0200 |
|---|---|---|
| committer | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2016-09-23 10:06:45 +0200 |
| commit | 3495f094bc77e5e493e6fba29e383eb2631746c0 (patch) | |
| tree | cff3a81b0b2ef2b7fe079edf48dc48ed2c7efeba | |
| parent | 430f53af7d2d8b9a2bda1986bd6ecb8eb7630b5d (diff) | |
| download | vcpkg-3495f094bc77e5e493e6fba29e383eb2631746c0.tar.gz vcpkg-3495f094bc77e5e493e6fba29e383eb2631746c0.zip | |
Fixed errors introduced during merge
| -rw-r--r-- | toolsrc/src/commands_installation.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_cmd_arguments.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp index 0977dcf37..7c4652f4d 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(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]); diff --git a/toolsrc/src/vcpkg_cmd_arguments.cpp b/toolsrc/src/vcpkg_cmd_arguments.cpp index e0f3f04ee..aea98dd10 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& 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) |