diff options
Diffstat (limited to 'toolsrc/src/StatusParagraphs.cpp')
| -rw-r--r-- | toolsrc/src/StatusParagraphs.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/toolsrc/src/StatusParagraphs.cpp b/toolsrc/src/StatusParagraphs.cpp index 463e3e3b8..3e23c519a 100644 --- a/toolsrc/src/StatusParagraphs.cpp +++ b/toolsrc/src/StatusParagraphs.cpp @@ -13,17 +13,19 @@ namespace vcpkg StatusParagraphs::const_iterator StatusParagraphs::find(const std::string& name, const triplet& target_triplet) const { - return std::find_if(begin(), end(), [&](const auto& pgh) + return std::find_if(begin(), end(), [&](const std::unique_ptr<StatusParagraph>& pgh) { - return pgh->package.name == name && pgh->package.target_triplet == target_triplet; + const package_spec& spec = pgh->package.spec; + return spec.name() == name && spec.target_triplet() == target_triplet; }); } StatusParagraphs::iterator StatusParagraphs::find(const std::string& name, const triplet& target_triplet) { - return std::find_if(begin(), end(), [&](const auto& pgh) + return std::find_if(begin(), end(), [&](const std::unique_ptr<StatusParagraph>& pgh) { - return pgh->package.name == name && pgh->package.target_triplet == target_triplet; + const package_spec& spec = pgh->package.spec; + return spec.name() == name && spec.target_triplet() == target_triplet; }); } @@ -41,18 +43,17 @@ namespace vcpkg StatusParagraphs::iterator StatusParagraphs::insert(std::unique_ptr<StatusParagraph> pgh) { Checks::check_throw(pgh != nullptr, "Inserted null paragraph"); - auto ptr = find(pgh->package.name, pgh->package.target_triplet); + const package_spec& spec = pgh->package.spec; + auto ptr = find(spec.name(), spec.target_triplet()); if (ptr == end()) { paragraphs.push_back(std::move(pgh)); return paragraphs.rbegin(); } - else - { - // consume data from provided pgh. - **ptr = std::move(*pgh); - return ptr; - } + + // consume data from provided pgh. + **ptr = std::move(*pgh); + return ptr; } std::ostream& vcpkg::operator<<(std::ostream& os, const StatusParagraphs& l) |