[vcpkg] Fix warning (as error) when building vcpgk/toolsrc with clang…

…++ 10 or g++ 9.3 (see #15148) (#15149)
microsoft · Dec 17, 2020 · a268c5a · a268c5a
1 parent 5d41154
commit a268c5a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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<const SourceControlFileLocation&> get_control_file(const std::string& src_name) const = 0;
         virtual std::vector<const SourceControlFileLocation*> load_all_control_files() const = 0;
     };

diff --git 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
@@ -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>
     {