diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-11 18:15:52 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-11 18:24:08 -0700 |
| commit | 7326b6c64dc6b04b6d8512f13dddf67bf7498bf1 (patch) | |
| tree | e6c095b1c26d0689730efe5f274bbeeb1090e57f /toolsrc/src/StatusParagraphs.cpp | |
| parent | 0bc21296c9ef32412237a8cc0c8141d0226b9070 (diff) | |
| parent | 92c0a91d3fdd9a9df5d3feae611981ea170703f5 (diff) | |
| download | vcpkg-7326b6c64dc6b04b6d8512f13dddf67bf7498bf1.tar.gz vcpkg-7326b6c64dc6b04b6d8512f13dddf67bf7498bf1.zip | |
Merge from master
Diffstat (limited to 'toolsrc/src/StatusParagraphs.cpp')
| -rw-r--r-- | toolsrc/src/StatusParagraphs.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/toolsrc/src/StatusParagraphs.cpp b/toolsrc/src/StatusParagraphs.cpp index ecaf7b745..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 <algorithm> +#include <algorithm> +#include <algorithm> 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<StatusParagraph>& pgh) { const PackageSpec& spec = pgh->package.spec; - return spec.name() == name && spec.target_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<StatusParagraph>& pgh) { const PackageSpec& spec = pgh->package.spec; - return spec.name() == name && spec.target_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; @@ -44,7 +47,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)); |