diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-08 04:36:11 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-06-08 04:36:11 -0700 |
| commit | 44a995d4461c54f0ff838af2649b618c533e60b7 (patch) | |
| tree | 0bb02f806780f4d7d2afb2cb1637fccbaf304606 /toolsrc/src | |
| parent | 247a6cec90004b8666d155eacc0f27d3a6c8fcf9 (diff) | |
| download | vcpkg-44a995d4461c54f0ff838af2649b618c533e60b7.tar.gz vcpkg-44a995d4461c54f0ff838af2649b618c533e60b7.zip | |
[vcpkg] Hotfix previous commit.
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/SourceParagraph.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/tests_dependencies.cpp | 48 |
2 files changed, 25 insertions, 25 deletions
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)); } }; } |