mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:28:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Fix warning (as error) when building vcpgk/toolsrc with clang++ 10 or g++ 9.3 (see #15148) (#15149)

Browse Source
This commit is contained in:
Kevin Lalumiere 2020-12-17 03:20:34 -05:00 committed by GitHub
parent 5d41154c42
commit a268c5a7f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
toolsrc/include/vcpkg/portfileprovider.h
View File

@ -12,6 +12,7 @@ namespace vcpkg::PortFileProvider
{
struct PortFileProvider
{
virtual ~PortFileProvider() = default;
virtual ExpectedS<const SourceControlFileLocation&> get_control_file(const std::string& src_name) const = 0;
virtual std::vector<const SourceControlFileLocation*> load_all_control_files() const = 0;
};

2
toolsrc/src/vcpkg-test/dependencies.cpp
View File

@ -603,7 +603,7 @@ TEST_CASE ("version parse relaxed", "[versionplan]")
auto version_long =
Versions::RelaxedVersion::from_string("1.20.300.4000.50000.6000000.70000000.80000000.18446744073709551610");
check_relaxed_version(version_long, {1, 20, 300, 4000, 50000, 6000000, 70000000, 80000000, 18446744073709551610});
check_relaxed_version(version_long, {1, 20, 300, 4000, 50000, 6000000, 70000000, 80000000, 18446744073709551610u});
auto version_invalid_characters = Versions::RelaxedVersion::from_string("1.a.0");
CHECK(!version_invalid_characters.has_value());

1
toolsrc/src/vcpkg/versiondeserializers.cpp
View File

@ -12,7 +12,6 @@ namespace
constexpr StringLiteral VERSION_STRING = "version-string";
constexpr StringLiteral VERSION_DATE = "version-date";
constexpr StringLiteral PORT_VERSION = "port-version";
constexpr StringLiteral GIT_TREE = "git-tree";
struct VersionDeserializer final : Json::IDeserializer<std::string>
{