diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-07 17:09:07 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-07 17:09:07 -0800 |
| commit | 7a1bc07142577cce32ee88c8d8ef60b386d19b6a (patch) | |
| tree | 899d2c0ee927ac23f24276f4f7d9f3c25c93550e /toolsrc | |
| parent | 21f69a44bead8c4ffe6719131172512519afe3aa (diff) | |
| download | vcpkg-7a1bc07142577cce32ee88c8d8ef60b386d19b6a.tar.gz vcpkg-7a1bc07142577cce32ee88c8d8ef60b386d19b6a.zip | |
[Dependencies] Remove unused parameter
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/include/vcpkg_Dependencies.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_installation.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_Dependencies.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg_Dependencies.h index 556ac8750..8e6808ee3 100644 --- a/toolsrc/include/vcpkg_Dependencies.h +++ b/toolsrc/include/vcpkg_Dependencies.h @@ -11,5 +11,5 @@ namespace vcpkg {namespace Dependencies std::unordered_set<package_spec> get_unmet_dependencies(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db); - std::vector<std::string> get_unmet_package_build_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db); + std::vector<std::string> get_unmet_package_build_dependencies(const vcpkg_paths& paths, const package_spec& spec); }} diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp index 917b4a219..3f40ba023 100644 --- a/toolsrc/src/commands_installation.cpp +++ b/toolsrc/src/commands_installation.cpp @@ -141,7 +141,7 @@ namespace vcpkg Input::check_triplet(spec.target_triplet(), paths); // Explicitly load and use the portfile's build dependencies when resolving the build command (instead of a cached package's dependencies). - auto first_level_deps = Dependencies::get_unmet_package_build_dependencies(paths, spec, status_db); + auto first_level_deps = Dependencies::get_unmet_package_build_dependencies(paths, spec); std::vector<package_spec> first_level_deps_specs; for (auto&& dep : first_level_deps) { diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp index d3b9dbb7b..10c3ce56f 100644 --- a/toolsrc/src/vcpkg_Dependencies.cpp +++ b/toolsrc/src/vcpkg_Dependencies.cpp @@ -13,7 +13,7 @@ namespace vcpkg { namespace Dependencies { // TODO: Refactoring between this function and install_package - static std::vector<std::string> get_single_level_unmet_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db) + static std::vector<std::string> get_single_level_unmet_dependencies(const vcpkg_paths& paths, const package_spec& spec) { const fs::path packages_dir_control_file_path = paths.package_dir(spec) / "CONTROL"; @@ -32,7 +32,7 @@ namespace vcpkg { namespace Dependencies return BinaryParagraph(pghs[0]).depends; } - return get_unmet_package_build_dependencies(paths, spec, status_db); + return get_unmet_package_build_dependencies(paths, spec); } static Graphs::Graph<package_spec> build_dependency_graph(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db) @@ -52,7 +52,7 @@ namespace vcpkg { namespace Dependencies continue; } - std::vector<std::string> dependencies_as_string = get_single_level_unmet_dependencies(paths, spec, status_db); + std::vector<std::string> dependencies_as_string = get_single_level_unmet_dependencies(paths, spec); for (const std::string& dep_as_string : dependencies_as_string) { @@ -87,7 +87,7 @@ namespace vcpkg { namespace Dependencies return Maps::extract_key_set(dependency_graph.adjacency_list()); } - std::vector<std::string> get_unmet_package_build_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db) + std::vector<std::string> get_unmet_package_build_dependencies(const vcpkg_paths& paths, const package_spec& spec) { const fs::path ports_dir_control_file_path = paths.port_dir(spec) / "CONTROL"; auto control_contents_maybe = Files::get_contents(ports_dir_control_file_path); |
