[vcpkg] Hotfix previous commit.

5 files changed, 28 insertions, 27 deletions

diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 8da12f3d9..ce15807ba 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -4,3 +4,4 @@ Build-Depends: zlib, libpng, libjpeg-turbo, tiff
 #Use the following line instead for optional features from OpenCV-contrib that require protobuf
 #Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf
 Description: computer vision library
+Supports: x64
\ No newline at end of file
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index 47ad5b830..2f30e338e 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -78,7 +78,7 @@ namespace vcpkg
             V141,
         };
 
-        bool supports(Architecture arch, Platform plat, Linkage crt, ToolsetVersion tools);
+        bool is_supported(Architecture arch, Platform plat, Linkage crt, ToolsetVersion tools);
 
     private:
         std::vector<Architecture> architectures;
diff --git a/toolsrc/include/vcpkg_Strings.h b/toolsrc/include/vcpkg_Strings.h
index cab8071aa..e95a0601a 100644
--- a/toolsrc/include/vcpkg_Strings.h
+++ b/toolsrc/include/vcpkg_Strings.h
@@ -61,7 +61,7 @@ namespace vcpkg::Strings
     template<class Container, class Transformer, class CharType>
     std::basic_string<CharType> join(const CharType* delimiter, const Container& v, Transformer transformer)
     {
-        if (v.empty())
+        if (v.size() == 0)
         {
             return std::basic_string<CharType>();
         }
diff --git a/toolsrc/src/SourceParagraph.cpp b/toolsrc/src/SourceParagraph.cpp
index 4001e891f..3b770a4b4 100644
--- a/toolsrc/src/SourceParagraph.cpp
+++ b/toolsrc/src/SourceParagraph.cpp
@@ -202,7 +202,7 @@ namespace vcpkg
             return std::move(unrecognized);
     }
 
-    bool Supports::supports(Architecture arch, Platform plat, Linkage crt, ToolsetVersion tools)
+    bool Supports::is_supported(Architecture arch, Platform plat, Linkage crt, ToolsetVersion tools)
     {
         auto is_in_or_empty = [](auto v, auto&& c) -> bool { return c.empty() || c.end() != Util::find(c, v); };
         if (!is_in_or_empty(arch, architectures)) return false;
diff --git a/toolsrc/src/tests_dependencies.cpp b/toolsrc/src/tests_dependencies.cpp
index fdf2afea8..995d46873 100644
--- a/toolsrc/src/tests_dependencies.cpp
+++ b/toolsrc/src/tests_dependencies.cpp
@@ -45,14 +45,14 @@ namespace UnitTest1
             });
             Assert::AreNotEqual(uintptr_t(0), uintptr_t(v.get()));
 
-            Assert::IsTrue(v.get()->supports(System::CPUArchitecture::X64,
-                                             Supports::Platform::UWP,
-                                             Supports::Linkage::DYNAMIC,
-                                             Supports::ToolsetVersion::V140));
-            Assert::IsTrue(v.get()->supports(System::CPUArchitecture::ARM,
-                                             Supports::Platform::WINDOWS,
-                                             Supports::Linkage::STATIC,
-                                             Supports::ToolsetVersion::V141));
+            Assert::IsTrue(v.get()->is_supported(System::CPUArchitecture::X64,
+                                                 Supports::Platform::UWP,
+                                                 Supports::Linkage::DYNAMIC,
+                                                 Supports::ToolsetVersion::V140));
+            Assert::IsTrue(v.get()->is_supported(System::CPUArchitecture::ARM,
+                                                 Supports::Platform::WINDOWS,
+                                                 Supports::Linkage::STATIC,
+                                                 Supports::ToolsetVersion::V141));
         }
 
         TEST_METHOD(parse_supports_invalid)
@@ -78,22 +78,22 @@ namespace UnitTest1
             });
             Assert::AreNotEqual(uintptr_t(0), uintptr_t(v.get()));
 
-            Assert::IsTrue(v.get()->supports(System::CPUArchitecture::X64,
-                                             Supports::Platform::WINDOWS,
-                                             Supports::Linkage::DYNAMIC,
-                                             Supports::ToolsetVersion::V140));
-            Assert::IsFalse(v.get()->supports(System::CPUArchitecture::ARM,
-                                              Supports::Platform::WINDOWS,
-                                              Supports::Linkage::DYNAMIC,
-                                              Supports::ToolsetVersion::V140));
-            Assert::IsFalse(v.get()->supports(System::CPUArchitecture::X64,
-                                              Supports::Platform::UWP,
-                                              Supports::Linkage::DYNAMIC,
-                                              Supports::ToolsetVersion::V140));
-            Assert::IsTrue(v.get()->supports(System::CPUArchitecture::X64,
-                                             Supports::Platform::WINDOWS,
-                                             Supports::Linkage::STATIC,
-                                             Supports::ToolsetVersion::V141));
+            Assert::IsTrue(v.get()->is_supported(System::CPUArchitecture::X64,
+                                                 Supports::Platform::WINDOWS,
+                                                 Supports::Linkage::DYNAMIC,
+                                                 Supports::ToolsetVersion::V140));
+            Assert::IsFalse(v.get()->is_supported(System::CPUArchitecture::ARM,
+                                                  Supports::Platform::WINDOWS,
+                                                  Supports::Linkage::DYNAMIC,
+                                                  Supports::ToolsetVersion::V140));
+            Assert::IsFalse(v.get()->is_supported(System::CPUArchitecture::X64,
+                                                  Supports::Platform::UWP,
+                                                  Supports::Linkage::DYNAMIC,
+                                                  Supports::ToolsetVersion::V140));
+            Assert::IsTrue(v.get()->is_supported(System::CPUArchitecture::X64,
+                                                 Supports::Platform::WINDOWS,
+                                                 Supports::Linkage::STATIC,
+                                                 Supports::ToolsetVersion::V141));
         }
     };
 }