aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include/SourceParagraph.h
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-06-08 00:36:17 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-06-08 04:32:57 -0700
commit247a6cec90004b8666d155eacc0f27d3a6c8fcf9 (patch)
treee63038044933f747161f94f52fc35f435573d08b /toolsrc/include/SourceParagraph.h
parent1b717d851fda51e03b98a18f5304e29b7876c8a3 (diff)
downloadvcpkg-247a6cec90004b8666d155eacc0f27d3a6c8fcf9.tar.gz
vcpkg-247a6cec90004b8666d155eacc0f27d3a6c8fcf9.zip
[vcpkg] Improve diagnostics upon port load failure
Diffstat (limited to 'toolsrc/include/SourceParagraph.h')
-rw-r--r--toolsrc/include/SourceParagraph.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index a53158f3f..47ad5b830 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -1,5 +1,6 @@
#pragma once
+#include "Span.h"
#include "vcpkg_System.h"
#include "vcpkg_expected.h"
@@ -23,7 +24,6 @@ namespace vcpkg
{
std::string name;
std::string remaining_fields_as_string;
- std::string valid_fields_as_string;
std::error_code error;
};
@@ -45,8 +45,11 @@ namespace vcpkg
std::vector<Dependency> depends;
};
- void print_error_message(const ParseControlErrorInfo& info);
- void print_error_message(std::vector<ParseControlErrorInfo> error_info_list);
+ void print_error_message(span<const ParseControlErrorInfo> error_info_list);
+ inline void print_error_message(const ParseControlErrorInfo& error_info_list)
+ {
+ return print_error_message({&error_info_list, 1});
+ }
std::vector<std::string> filter_dependencies(const std::vector<Dependency>& deps, const Triplet& t);