RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

[unittests] Use std::make_tuple to make some toolchains happy again

Browse Source 
My toolchain stopped working (LLVM 8.0, libstdc++ 5.4.0) after 577adda:

06:25:37 ../unittests/Support/Path.cpp:91:7: error: chosen constructor is explicit in copy-initialization
06:25:37       {"", false, false},  {"/", true, true},      {"/foo", true, true},
06:25:37       ^~~~~~~~~~~~~~~~~~
06:25:37 /proj/flexasic/app/llvm/8.0/bin/../lib/gcc/x86_64-unknown-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple:479:19: note: explicit constructor declared here
06:25:37         constexpr tuple(_UElements&&... __elements)
06:25:37                   ^

This commit adds explicit calls to std::make_tuple to work around
the problem.
This commit is contained in:
Mikael Holmen 2020-09-24 11:18:21 +02:00
parent f6f274223b
commit a3128cb228
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unittests/Support/Path.cpp
View File

@ -88,11 +88,19 @@ TEST(is_separator, Works) {
TEST(is_absolute_gnu, Works) { TEST(is_absolute_gnu, Works) {
// Test tuple <Path, ExpectedPosixValue, ExpectedWindowsValue>. // Test tuple <Path, ExpectedPosixValue, ExpectedWindowsValue>.
const std::tuple<StringRef, bool, bool> Paths[] = { const std::tuple<StringRef, bool, bool> Paths[] = {
{"", false, false}, {"/", true, true}, {"/foo", true, true}, std::make_tuple("", false, false),
{"\\", false, true}, {"\\foo", false, true}, {"foo", false, false}, std::make_tuple("/", true, true),
{"c", false, false}, {"c:", false, true}, {"c:\\", false, true}, std::make_tuple("/foo", true, true),
{"!:", false, true}, {"xx:", false, false}, {"c:abc\\", false, true}, std::make_tuple("\\", false, true),
{":", false, false}}; std::make_tuple("\\foo", false, true),
std::make_tuple("foo", false, false),
std::make_tuple("c", false, false),
std::make_tuple("c:", false, true),
std::make_tuple("c:\\", false, true),
std::make_tuple("!:", false, true),
std::make_tuple("xx:", false, false),
std::make_tuple("c:abc\\", false, true),
std::make_tuple(":", false, false)};
for (const auto &Path : Paths) { for (const auto &Path : Paths) {
EXPECT_EQ(path::is_absolute_gnu(std::get<0>(Path), path::Style::posix), EXPECT_EQ(path::is_absolute_gnu(std::get<0>(Path), path::Style::posix),