Merge branch 'master' into master

1 files changed, 17 insertions, 2 deletions

diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index 72dca8324..5ae9b38b8 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -5,16 +5,31 @@
 
 namespace vcpkg
 {
+    struct triplet;
+
+    struct dependency
+    {
+        std::string name;
+        std::string qualifier;
+    };
+
+    std::ostream& operator<<(std::ostream& os, const dependency& p);
+
     struct SourceParagraph
     {
         SourceParagraph();
 
-        explicit SourceParagraph(const std::unordered_map<std::string, std::string>& fields);
+        explicit SourceParagraph(std::unordered_map<std::string, std::string> fields);
 
         std::string name;
         std::string version;
         std::string description;
         std::string maintainer;
-        std::vector<std::string> depends;
+        std::vector<dependency> depends;
     };
+
+    std::vector<std::string> filter_dependencies(const std::vector<vcpkg::dependency>& deps, const triplet& t);
+
+    std::vector<vcpkg::dependency> expand_qualified_dependencies(const std::vector<std::string>& depends);
+    std::vector<std::string> parse_depends(const std::string& depends_string);
 }