[vcpkg] Hotfix previous commit.
MODIFY
include/SourceParagraph.h
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;

MODIFY
include/vcpkg_Strings.h
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>();
}

MODIFY
src/SourceParagraph.cpp
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;

MODIFY
src/tests_dependencies.cpp
src/tests_dependencies.cpp
@@ -45,11 +45,11 @@ namespace UnitTest1
});
Assert::AreNotEqual(uintptr_t(0), uintptr_t(v.get()));
- Assert::IsTrue(v.get()->supports(System::CPUArchitecture::X64,
+ Assert::IsTrue(v.get()->is_supported(System::CPUArchitecture::X64,
Supports::Platform::UWP,
Supports::Linkage::DYNAMIC,
Supports::ToolsetVersion::V140));
- Assert::IsTrue(v.get()->supports(System::CPUArchitecture::ARM,
+ Assert::IsTrue(v.get()->is_supported(System::CPUArchitecture::ARM,
Supports::Platform::WINDOWS,
Supports::Linkage::STATIC,
Supports::ToolsetVersion::V141));
@@ -78,19 +78,19 @@ namespace UnitTest1
});
Assert::AreNotEqual(uintptr_t(0), uintptr_t(v.get()));
- Assert::IsTrue(v.get()->supports(System::CPUArchitecture::X64,
+ Assert::IsTrue(v.get()->is_supported(System::CPUArchitecture::X64,
Supports::Platform::WINDOWS,
Supports::Linkage::DYNAMIC,
Supports::ToolsetVersion::V140));
- Assert::IsFalse(v.get()->supports(System::CPUArchitecture::ARM,
+ Assert::IsFalse(v.get()->is_supported(System::CPUArchitecture::ARM,
Supports::Platform::WINDOWS,
Supports::Linkage::DYNAMIC,
Supports::ToolsetVersion::V140));
- Assert::IsFalse(v.get()->supports(System::CPUArchitecture::X64,
+ Assert::IsFalse(v.get()->is_supported(System::CPUArchitecture::X64,
Supports::Platform::UWP,
Supports::Linkage::DYNAMIC,
Supports::ToolsetVersion::V140));
- Assert::IsTrue(v.get()->supports(System::CPUArchitecture::X64,
+ Assert::IsTrue(v.get()->is_supported(System::CPUArchitecture::X64,
Supports::Platform::WINDOWS,
Supports::Linkage::STATIC,
Supports::ToolsetVersion::V141));

[vcpkg] Hotfix previous commit.