From 3e94a8db42804a6ac0cc71e5b74483ebd5958f83 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:03:34 -0700 Subject: PackageSpec.target_triplet() -> ".triplet() --- toolsrc/src/StatusParagraphs.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolsrc/src/StatusParagraphs.cpp') diff --git a/toolsrc/src/StatusParagraphs.cpp b/toolsrc/src/StatusParagraphs.cpp index ecaf7b745..a24a8208f 100644 --- a/toolsrc/src/StatusParagraphs.cpp +++ b/toolsrc/src/StatusParagraphs.cpp @@ -16,7 +16,7 @@ namespace vcpkg return std::find_if(begin(), end(), [&](const std::unique_ptr& pgh) { const PackageSpec& spec = pgh->package.spec; - return spec.name() == name && spec.target_triplet() == target_triplet; + return spec.name() == name && spec.triplet() == target_triplet; }); } @@ -25,7 +25,7 @@ namespace vcpkg return std::find_if(begin(), end(), [&](const std::unique_ptr& pgh) { const PackageSpec& spec = pgh->package.spec; - return spec.name() == name && spec.target_triplet() == target_triplet; + return spec.name() == name && spec.triplet() == target_triplet; }); } @@ -44,7 +44,7 @@ namespace vcpkg { Checks::check_exit(VCPKG_LINE_INFO, pgh != nullptr, "Inserted null paragraph"); const PackageSpec& spec = pgh->package.spec; - auto ptr = find(spec.name(), spec.target_triplet()); + auto ptr = find(spec.name(), spec.triplet()); if (ptr == end()) { paragraphs.push_back(std::move(pgh)); -- cgit v1.2.3 From cb679871e061cf2af460e53b57a56441b0eed575 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:08:47 -0700 Subject: [StatusParagraph] target_triplet -> triplet --- toolsrc/src/StatusParagraphs.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'toolsrc/src/StatusParagraphs.cpp') diff --git a/toolsrc/src/StatusParagraphs.cpp b/toolsrc/src/StatusParagraphs.cpp index a24a8208f..59e6ee331 100644 --- a/toolsrc/src/StatusParagraphs.cpp +++ b/toolsrc/src/StatusParagraphs.cpp @@ -1,6 +1,9 @@ #include "pch.h" #include "StatusParagraphs.h" #include "vcpkg_Checks.h" +#include +#include +#include namespace vcpkg { @@ -11,27 +14,27 @@ namespace vcpkg { }; - StatusParagraphs::const_iterator StatusParagraphs::find(const std::string& name, const Triplet& target_triplet) const + StatusParagraphs::const_iterator StatusParagraphs::find(const std::string& name, const Triplet& triplet) const { return std::find_if(begin(), end(), [&](const std::unique_ptr& pgh) { const PackageSpec& spec = pgh->package.spec; - return spec.name() == name && spec.triplet() == target_triplet; + return spec.name() == name && spec.triplet() == triplet; }); } - StatusParagraphs::iterator StatusParagraphs::find(const std::string& name, const Triplet& target_triplet) + StatusParagraphs::iterator StatusParagraphs::find(const std::string& name, const Triplet& triplet) { return std::find_if(begin(), end(), [&](const std::unique_ptr& pgh) { const PackageSpec& spec = pgh->package.spec; - return spec.name() == name && spec.triplet() == target_triplet; + return spec.name() == name && spec.triplet() == triplet; }); } - StatusParagraphs::const_iterator StatusParagraphs::find_installed(const std::string& name, const Triplet& target_triplet) const + StatusParagraphs::const_iterator StatusParagraphs::find_installed(const std::string& name, const Triplet& triplet) const { - const const_iterator it = find(name, target_triplet); + const const_iterator it = find(name, triplet); if (it != end() && (*it)->want == Want::INSTALL && (*it)->state == InstallState::INSTALLED) { return it; -- cgit v1.2.3