From a268c5a7f1aa0e933924bc09d48d92f0120769e5 Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Thu, 17 Dec 2020 03:20:34 -0500 Subject: [vcpkg] Fix warning (as error) when building vcpgk/toolsrc with clang++ 10 or g++ 9.3 (see #15148) (#15149) --- toolsrc/include/vcpkg/portfileprovider.h | 1 + toolsrc/src/vcpkg-test/dependencies.cpp | 2 +- toolsrc/src/vcpkg/versiondeserializers.cpp | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolsrc/include/vcpkg/portfileprovider.h b/toolsrc/include/vcpkg/portfileprovider.h index 9dbd5ec51..b93c58e8c 100644 --- a/toolsrc/include/vcpkg/portfileprovider.h +++ b/toolsrc/include/vcpkg/portfileprovider.h @@ -12,6 +12,7 @@ namespace vcpkg::PortFileProvider { struct PortFileProvider { + virtual ~PortFileProvider() = default; virtual ExpectedS get_control_file(const std::string& src_name) const = 0; virtual std::vector load_all_control_files() const = 0; }; 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 { -- cgit v1.2.3