diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-02 19:39:45 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-02 19:39:45 -0700 |
| commit | 079a027b1e81becd4ba448362579f625dd7bcca4 (patch) | |
| tree | 1f9b7e3019b0d0ea3fc69972b97f7990db450473 /toolsrc/src | |
| parent | 87a78a78dcb88d1656eda5dcbdf306fb55eba575 (diff) | |
| download | vcpkg-079a027b1e81becd4ba448362579f625dd7bcca4.tar.gz vcpkg-079a027b1e81becd4ba448362579f625dd7bcca4.zip | |
parse_depends() now handles empty case internally
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/BinaryParagraph.cpp | 6 | ||||
| -rw-r--r-- | toolsrc/src/SourceParagraph.cpp | 6 | ||||
| -rw-r--r-- | toolsrc/src/vcpkglib_helpers.cpp | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 48d04f686..61c74fcf5 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -23,11 +23,7 @@ namespace vcpkg } std::string deps = optional_field(fields, "Depends"); - if (!deps.empty()) - { - this->depends.clear(); - this->depends = parse_depends(deps); - } + this->depends = parse_depends(deps); } BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const triplet& target_triplet) diff --git a/toolsrc/src/SourceParagraph.cpp b/toolsrc/src/SourceParagraph.cpp index 374121ae9..75c8ebfef 100644 --- a/toolsrc/src/SourceParagraph.cpp +++ b/toolsrc/src/SourceParagraph.cpp @@ -12,9 +12,5 @@ vcpkg::SourceParagraph::SourceParagraph(const std::unordered_map<std::string, st maintainer(optional_field(fields, "Maintainer")) { std::string deps = optional_field(fields, "Build-Depends"); - if (!deps.empty()) - { - this->depends.clear(); - this->depends = parse_depends(deps); - }; + this->depends = parse_depends(deps); } diff --git a/toolsrc/src/vcpkglib_helpers.cpp b/toolsrc/src/vcpkglib_helpers.cpp index 04fdf214e..02182b995 100644 --- a/toolsrc/src/vcpkglib_helpers.cpp +++ b/toolsrc/src/vcpkglib_helpers.cpp @@ -24,6 +24,11 @@ namespace vcpkg {namespace details std::vector<std::string> parse_depends(const std::string& depends_string) { + if (depends_string.empty()) + { + return {}; + } + std::vector<std::string> out; size_t cur = 0; |
