aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include/Paragraphs.h
diff options
context:
space:
mode:
authormmazaherit <m.mazaheri.t@gmail.com>2017-06-08 23:53:58 -0400
committermmazaherit <m.mazaheri.t@gmail.com>2017-06-08 23:53:58 -0400
commite544b742903ddceba71d4652f30a9df4baca598e (patch)
tree824fdf1bca936d845c20b51a140e9f60629653cb /toolsrc/include/Paragraphs.h
parent9b57ecbdd786113e33d8a149d240769682c7846e (diff)
parentff52016d018c9d346cd402e9cc98d24dff39d900 (diff)
downloadvcpkg-e544b742903ddceba71d4652f30a9df4baca598e.tar.gz
vcpkg-e544b742903ddceba71d4652f30a9df4baca598e.zip
Merge branch 'master' of https://github.com/mmazat/vcpkg
Diffstat (limited to 'toolsrc/include/Paragraphs.h')
-rw-r--r--toolsrc/include/Paragraphs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/toolsrc/include/Paragraphs.h b/toolsrc/include/Paragraphs.h
index 66f6bd2e4..59f0eefc8 100644
--- a/toolsrc/include/Paragraphs.h
+++ b/toolsrc/include/Paragraphs.h
@@ -16,7 +16,8 @@ namespace vcpkg::Paragraphs
Expected<ParagraphDataMap> parse_single_paragraph(const std::string& str);
Expected<std::vector<ParagraphDataMap>> parse_paragraphs(const std::string& str);
- Expected<SourceParagraph> try_load_port(const Files::Filesystem& fs, const fs::path& control_path);
+ ExpectedT<SourceParagraph, ParseControlErrorInfo> try_load_port(const Files::Filesystem& fs,
+ const fs::path& control_path);
Expected<BinaryParagraph> try_load_cached_package(const VcpkgPaths& paths, const PackageSpec& spec);