diff options
| author | Rémy Tassoux <rt2@rt2.fr> | 2017-12-23 18:02:35 +0100 |
|---|---|---|
| committer | Rémy Tassoux <rt2@rt2.fr> | 2017-12-23 18:02:35 +0100 |
| commit | 6699ddabb1b3cf753401a79d6da544437e3b2994 (patch) | |
| tree | 028538f9816f3e6254fae945210f4e3f9ff2db01 /toolsrc/include | |
| parent | 40245cde8cde51897d8f79971b2b8c917dab399d (diff) | |
| parent | 544e99310d9f183b4add85c360de2df65ba64598 (diff) | |
| download | vcpkg-6699ddabb1b3cf753401a79d6da544437e3b2994.tar.gz vcpkg-6699ddabb1b3cf753401a79d6da544437e3b2994.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/sourceparagraph.h | 3 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/versiont.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/toolsrc/include/vcpkg/sourceparagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h index 58e76b7b1..dcbbc1c3b 100644 --- a/toolsrc/include/vcpkg/sourceparagraph.h +++ b/toolsrc/include/vcpkg/sourceparagraph.h @@ -14,12 +14,11 @@ namespace vcpkg { struct Dependency { - static Dependency parse_dependency(std::string&& name, std::string&& qualifier); - Features depend; std::string qualifier; std::string name() const; + static Dependency parse_dependency(std::string name, std::string qualifier); }; std::vector<std::string> filter_dependencies(const std::vector<Dependency>& deps, const Triplet& t); diff --git a/toolsrc/include/vcpkg/versiont.h b/toolsrc/include/vcpkg/versiont.h index 0ffb4d602..6d8332521 100644 --- a/toolsrc/include/vcpkg/versiont.h +++ b/toolsrc/include/vcpkg/versiont.h @@ -6,7 +6,7 @@ namespace vcpkg struct VersionT { VersionT(); - VersionT(std::string&& value); + VersionT(const std::string& value); const std::string& to_string() const; |