diff options
| author | mmazaherit <m.mazaheri.t@gmail.com> | 2017-06-08 23:53:58 -0400 |
|---|---|---|
| committer | mmazaherit <m.mazaheri.t@gmail.com> | 2017-06-08 23:53:58 -0400 |
| commit | e544b742903ddceba71d4652f30a9df4baca598e (patch) | |
| tree | 824fdf1bca936d845c20b51a140e9f60629653cb /toolsrc/include/PackageSpec.h | |
| parent | 9b57ecbdd786113e33d8a149d240769682c7846e (diff) | |
| parent | ff52016d018c9d346cd402e9cc98d24dff39d900 (diff) | |
| download | vcpkg-e544b742903ddceba71d4652f30a9df4baca598e.tar.gz vcpkg-e544b742903ddceba71d4652f30a9df4baca598e.zip | |
Merge branch 'master' of https://github.com/mmazat/vcpkg
Diffstat (limited to 'toolsrc/include/PackageSpec.h')
| -rw-r--r-- | toolsrc/include/PackageSpec.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 050d9d079..58edb8274 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -7,9 +7,11 @@ namespace vcpkg { struct PackageSpec { - static Expected<PackageSpec> from_string(const std::string& spec_as_string, const Triplet& default_triplet); + static ExpectedT<PackageSpec, PackageSpecParseResult> from_string(const std::string& spec_as_string, + const Triplet& default_triplet); static std::string to_string(const std::string& name, const Triplet& triplet); - static Expected<PackageSpec> from_name_and_triplet(const std::string& name, const Triplet& triplet); + static ExpectedT<PackageSpec, PackageSpecParseResult> from_name_and_triplet(const std::string& name, + const Triplet& triplet); const std::string& name() const; |