diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-17 15:10:43 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-17 15:10:43 -0800 |
| commit | 71b985dd032c37fd88010b70fd03dc4a5cfa9cf9 (patch) | |
| tree | 506444ccea12dd9de60c4c739a9c2cc64f780b8f | |
| parent | b4304c9c995d7984566ed28294836bccbdfc24b2 (diff) | |
| download | vcpkg-71b985dd032c37fd88010b70fd03dc4a5cfa9cf9.tar.gz vcpkg-71b985dd032c37fd88010b70fd03dc4a5cfa9cf9.zip | |
Remove try_load_port() overload
| -rw-r--r-- | toolsrc/include/vcpkglib.h | 5 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_Dependencies.cpp | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/toolsrc/include/vcpkglib.h b/toolsrc/include/vcpkglib.h index b1653d197..50635589a 100644 --- a/toolsrc/include/vcpkglib.h +++ b/toolsrc/include/vcpkglib.h @@ -22,10 +22,5 @@ namespace vcpkg expected<SourceParagraph> try_load_port(const fs::path& control_path); - inline expected<SourceParagraph> try_load_port(const vcpkg_paths& paths, const std::string& name) - { - return try_load_port(paths.ports / name); - } - expected<BinaryParagraph> try_load_cached_package(const vcpkg_paths& paths, const package_spec& spec); } // namespace vcpkg diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp index 957814e6e..b255cc77b 100644 --- a/toolsrc/src/vcpkg_Dependencies.cpp +++ b/toolsrc/src/vcpkg_Dependencies.cpp @@ -80,7 +80,7 @@ namespace vcpkg::Dependencies continue; } - expected<SourceParagraph> maybe_spgh = try_load_port(paths, spec.name()); + expected<SourceParagraph> maybe_spgh = try_load_port(paths.port_dir(spec)); SourceParagraph* spgh = maybe_spgh.get(); Checks::check_exit(spgh != nullptr, "Cannot find package %s", spec.name()); process_dependencies(filter_dependencies(spgh->depends, spec.target_triplet())); |
