diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-23 01:56:25 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-01-23 01:56:25 -0800 |
| commit | 10d712ed018fe3b2cd8d485e41f32ad555d9a1f1 (patch) | |
| tree | 60f6630f23b07f3b6d7be1fcc05cca2845b820c7 /toolsrc/src | |
| parent | 3e42585f47a7c6abaa516cf2ed7b1e702ffd38ca (diff) | |
| download | vcpkg-10d712ed018fe3b2cd8d485e41f32ad555d9a1f1.tar.gz vcpkg-10d712ed018fe3b2cd8d485e41f32ad555d9a1f1.zip | |
[vcpkg] Added StatusParagraph::is_installed()
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/statusparagraphs.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/vcpkglib.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/vcpkg/statusparagraphs.cpp b/toolsrc/src/vcpkg/statusparagraphs.cpp index d4afc0427..19919b76f 100644 --- a/toolsrc/src/vcpkg/statusparagraphs.cpp +++ b/toolsrc/src/vcpkg/statusparagraphs.cpp @@ -48,7 +48,7 @@ namespace vcpkg const Triplet& triplet) const { const const_iterator it = find(name, triplet); - if (it != end() && (*it)->want == Want::INSTALL && (*it)->state == InstallState::INSTALLED) + if (it != end() && (*it)->is_installed()) { return it; } diff --git a/toolsrc/src/vcpkg/vcpkglib.cpp b/toolsrc/src/vcpkg/vcpkglib.cpp index 5b2cec4d0..de6ffefed 100644 --- a/toolsrc/src/vcpkg/vcpkglib.cpp +++ b/toolsrc/src/vcpkg/vcpkglib.cpp @@ -173,7 +173,7 @@ namespace vcpkg std::vector<StatusParagraph*> installed_packages; for (auto&& pgh : status_db) { - if (pgh->state != InstallState::INSTALLED || pgh->want != Want::INSTALL) continue; + if (!pgh->is_installed()) continue; installed_packages.push_back(pgh.get()); } @@ -189,7 +189,7 @@ namespace vcpkg for (const std::unique_ptr<StatusParagraph>& pgh : status_db) { - if (pgh->state != InstallState::INSTALLED || !pgh->package.feature.empty()) + if (!pgh->is_installed() || !pgh->package.feature.empty()) { continue; } |
