diff options
| author | Daniel Shaw <t-dansha@microsoft.com> | 2017-06-05 17:55:06 -0700 |
|---|---|---|
| committer | Daniel Shaw <t-dansha@microsoft.com> | 2017-06-06 14:02:59 -0700 |
| commit | cc443d1c6b10735f9e4e5d439432124ffcfb376f (patch) | |
| tree | bad7f33b69ff29ea32cd5d220834248873c83086 | |
| parent | 6c09b1dd240cc295c6b123ce3597ae612e872e2d (diff) | |
| download | vcpkg-cc443d1c6b10735f9e4e5d439432124ffcfb376f.tar.gz vcpkg-cc443d1c6b10735f9e4e5d439432124ffcfb376f.zip | |
minor changes
| -rw-r--r-- | toolsrc/include/SourceParagraph.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/SourceParagraph.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_build.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h index 9874eb3a9..7b0fa3178 100644 --- a/toolsrc/include/SourceParagraph.h +++ b/toolsrc/include/SourceParagraph.h @@ -32,7 +32,7 @@ namespace vcpkg static ExpectedT<SourceParagraph, ParseControlErrorInfo> parse_control_file( std::unordered_map<std::string, std::string> fields); - SourceParagraph(); + SourceParagraph() = default; std::string name; std::string version; diff --git a/toolsrc/src/SourceParagraph.cpp b/toolsrc/src/SourceParagraph.cpp index 8a131ef6a..c77659176 100644 --- a/toolsrc/src/SourceParagraph.cpp +++ b/toolsrc/src/SourceParagraph.cpp @@ -37,8 +37,6 @@ namespace vcpkg return valid_fields; } - SourceParagraph::SourceParagraph() = default; - void print_error_message(const ParseControlErrorInfo& info) { System::println( diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 4a0cee021..294b70b27 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -35,7 +35,7 @@ namespace vcpkg::Commands::BuildCommand const ExpectedT<SourceParagraph, ParseControlErrorInfo> maybe_spgh = Paragraphs::try_load_port(paths.get_filesystem(), port_dir); - // why do we add a const here + if (!maybe_spgh) { print_error_message(maybe_spgh.error()); |