diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-09-27 15:51:16 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-09-27 15:51:16 -0700 |
| commit | cc29d43f8577be1e053572c83958e633fbbea4e5 (patch) | |
| tree | ee3d05c01cfb442d0da7a73515093b10892ef23f /toolsrc/include | |
| parent | 2ed13a583d5c8537680125d2ab5ec77b0f63503c (diff) | |
| parent | 687ac42cdd39fece9ed816836c049607f8d1223b (diff) | |
| download | vcpkg-cc29d43f8577be1e053572c83958e633fbbea4e5.tar.gz vcpkg-cc29d43f8577be1e053572c83958e633fbbea4e5.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/triplet.h | 2 | ||||
| -rw-r--r-- | toolsrc/include/vcpkglib_helpers.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h index 0c42f2ec7..23c1ea404 100644 --- a/toolsrc/include/triplet.h +++ b/toolsrc/include/triplet.h @@ -20,7 +20,7 @@ namespace vcpkg std::string system() const; - bool validate(const vcpkg_paths& paths); + bool validate(const vcpkg_paths& paths) const; }; bool operator==(const triplet& left, const triplet& right); diff --git a/toolsrc/include/vcpkglib_helpers.h b/toolsrc/include/vcpkglib_helpers.h index e15b59b0b..72711d63b 100644 --- a/toolsrc/include/vcpkglib_helpers.h +++ b/toolsrc/include/vcpkglib_helpers.h @@ -4,9 +4,9 @@ namespace vcpkg {namespace details { - void optional_field(const std::unordered_map<std::string, std::string>& fields, std::string& out, const std::string& fieldname); + std::string optional_field(const std::unordered_map<std::string, std::string>& fields, const std::string& fieldname); - void required_field(const std::unordered_map<std::string, std::string>& fields, std::string& out, const std::string& fieldname); + std::string required_field(const std::unordered_map<std::string, std::string>& fields, const std::string& fieldname); - void parse_depends(const std::string& depends_string, std::vector<std::string>& out); + std::vector<std::string> parse_depends(const std::string& depends_string); }} |