diff options
| author | Kevin Lalumiere <klalumiere@coveo.com> | 2020-12-17 03:20:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-17 00:20:34 -0800 |
| commit | a268c5a7f1aa0e933924bc09d48d92f0120769e5 (patch) | |
| tree | d5ba45f9ab69b3a4235f5a6d10d188a9bbb78d9e /toolsrc/src | |
| parent | 5d41154c4284209706b124baeac6a523ba667ec0 (diff) | |
| download | vcpkg-a268c5a7f1aa0e933924bc09d48d92f0120769e5.tar.gz vcpkg-a268c5a7f1aa0e933924bc09d48d92f0120769e5.zip | |
[vcpkg] Fix warning (as error) when building vcpgk/toolsrc with clang++ 10 or g++ 9.3 (see #15148) (#15149)
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg-test/dependencies.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/versiondeserializers.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp index 2aae7fffa..d1834b13d 100644 --- a/toolsrc/src/vcpkg-test/dependencies.cpp +++ b/toolsrc/src/vcpkg-test/dependencies.cpp @@ -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()); diff --git a/toolsrc/src/vcpkg/versiondeserializers.cpp b/toolsrc/src/vcpkg/versiondeserializers.cpp index ec27fb8c8..ee64630e3 100644 --- a/toolsrc/src/vcpkg/versiondeserializers.cpp +++ b/toolsrc/src/vcpkg/versiondeserializers.cpp @@ -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> { |