diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-10 13:06:44 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-10 13:06:44 -0700 |
| commit | 0f54ec446d63923a99524fd98657010816e06cb5 (patch) | |
| tree | cca4a03da6f454eea056480b0f7030ff7012a854 | |
| parent | 6699737c6d1b9e33c4448080c006317333b1e969 (diff) | |
| download | vcpkg-0f54ec446d63923a99524fd98657010816e06cb5.tar.gz vcpkg-0f54ec446d63923a99524fd98657010816e06cb5.zip | |
[BinaryParagraph] target_triplet -> triplet
| -rw-r--r-- | toolsrc/include/BinaryParagraph.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/BinaryParagraph.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/toolsrc/include/BinaryParagraph.h b/toolsrc/include/BinaryParagraph.h index d92ae7e6d..e29e0f51b 100644 --- a/toolsrc/include/BinaryParagraph.h +++ b/toolsrc/include/BinaryParagraph.h @@ -10,7 +10,7 @@ namespace vcpkg { BinaryParagraph(); explicit BinaryParagraph(std::unordered_map<std::string, std::string> fields); - BinaryParagraph(const SourceParagraph& spgh, const Triplet& target_triplet); + BinaryParagraph(const SourceParagraph& spgh, const Triplet& triplet); std::string displayname() const; diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 8e8d6a95b..499ef54f7 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -29,9 +29,9 @@ namespace vcpkg { const std::string name = details::remove_required_field(&fields, BinaryParagraphRequiredField::PACKAGE); const std::string architecture = details::remove_required_field(&fields, BinaryParagraphRequiredField::ARCHITECTURE); - const Triplet target_triplet = Triplet::from_canonical_name(architecture); + const Triplet triplet = Triplet::from_canonical_name(architecture); - this->spec = PackageSpec::from_name_and_triplet(name, target_triplet).value_or_exit(VCPKG_LINE_INFO); + this->spec = PackageSpec::from_name_and_triplet(name, triplet).value_or_exit(VCPKG_LINE_INFO); this->version = details::remove_required_field(&fields, BinaryParagraphRequiredField::VERSION); this->description = details::remove_optional_field(&fields, BinaryParagraphOptionalField::DESCRIPTION); @@ -44,13 +44,13 @@ namespace vcpkg this->depends = parse_depends(deps); } - BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const Triplet& target_triplet) + BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const Triplet& triplet) { - this->spec = PackageSpec::from_name_and_triplet(spgh.name, target_triplet).value_or_exit(VCPKG_LINE_INFO); + this->spec = PackageSpec::from_name_and_triplet(spgh.name, triplet).value_or_exit(VCPKG_LINE_INFO); this->version = spgh.version; this->description = spgh.description; this->maintainer = spgh.maintainer; - this->depends = filter_dependencies(spgh.depends, target_triplet); + this->depends = filter_dependencies(spgh.depends, triplet); } std::string BinaryParagraph::displayname() const |