diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-10 13:08:47 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-10 13:08:47 -0700 |
| commit | cb679871e061cf2af460e53b57a56441b0eed575 (patch) | |
| tree | ac2953b76a74c50254aafd57893b39f8accb51fa | |
| parent | 0f54ec446d63923a99524fd98657010816e06cb5 (diff) | |
| download | vcpkg-cb679871e061cf2af460e53b57a56441b0eed575.tar.gz vcpkg-cb679871e061cf2af460e53b57a56441b0eed575.zip | |
[StatusParagraph] target_triplet -> triplet
| -rw-r--r-- | toolsrc/include/StatusParagraphs.h | 6 | ||||
| -rw-r--r-- | toolsrc/src/StatusParagraphs.cpp | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/StatusParagraphs.h index 9c7f443d0..c5ece9616 100644 --- a/toolsrc/include/StatusParagraphs.h +++ b/toolsrc/include/StatusParagraphs.h @@ -18,14 +18,14 @@ namespace vcpkg { return find(spec.name(), spec.triplet()); } - const_iterator find(const std::string& name, const Triplet& target_triplet) const; - iterator find(const std::string& name, const Triplet& target_triplet); + const_iterator find(const std::string& name, const Triplet& triplet) const; + iterator find(const std::string& name, const Triplet& triplet); const_iterator find_installed(const PackageSpec& spec) const { return find_installed(spec.name(), spec.triplet()); } - const_iterator find_installed(const std::string& name, const Triplet& target_triplet) const; + const_iterator find_installed(const std::string& name, const Triplet& triplet) const; iterator insert(std::unique_ptr<StatusParagraph>); 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 <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.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.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; |