From a098ecad0316b627a1fd56bfe39119f92702aa5c Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 26 Sep 2016 21:12:04 -0700 Subject: vcpkglib_helpers: Return output instead of accepting it as arg --- toolsrc/src/SourceParagraph.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'toolsrc/src/SourceParagraph.cpp') diff --git a/toolsrc/src/SourceParagraph.cpp b/toolsrc/src/SourceParagraph.cpp index 7e3b0403e..374121ae9 100644 --- a/toolsrc/src/SourceParagraph.cpp +++ b/toolsrc/src/SourceParagraph.cpp @@ -5,17 +5,16 @@ using namespace vcpkg::details; vcpkg::SourceParagraph::SourceParagraph() = default; -vcpkg::SourceParagraph::SourceParagraph(const std::unordered_map& fields) +vcpkg::SourceParagraph::SourceParagraph(const std::unordered_map& fields): + name(required_field(fields, "Source")), + version(required_field(fields, "Version")), + description(optional_field(fields, "Description")), + maintainer(optional_field(fields, "Maintainer")) { - required_field(fields, name, "Source"); - required_field(fields, version, "Version"); - optional_field(fields, description, "Description"); - std::string deps; - optional_field(fields, deps, "Build-Depends"); + std::string deps = optional_field(fields, "Build-Depends"); if (!deps.empty()) { - depends.clear(); - parse_depends(deps, depends); - } - optional_field(fields, maintainer, "Maintainer"); + this->depends.clear(); + this->depends = parse_depends(deps); + }; } -- cgit v1.2.3