maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Support] Work around an issue when building with old versions of libstdc++ 

llvm/lib/Support/UnicodeNameToCodepoint.cpp:189:12: error: chosen constructor is explicit in copy-initialization
    return {N, false, 0};
           ^~~~~~~~~~~~~
/usr/include/c++/5.4.0/tuple:479:19: note: explicit constructor declared here
        constexpr tuple(_UElements&&... __elements)
                  ^
This commit is contained in:
Benjamin Kramer 2022-06-26 12:54:32 +02:00
parent dea5a9cc92
commit f5cd172e51
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/Support/UnicodeNameToCodepoint.cpp
View File

@ -186,10 +186,10 @@ compareNode(uint32_t Offset, StringRef Name, bool Strict,
N.IsRoot || startsWith(Name, N.Name, Strict, Consummed,
PreviousCharInName, PreviousCharInNeedle);
if (!DoesStartWith)
return {N, false, 0};
return std::make_tuple(N, false, 0);
if (Name.size() - Consummed == 0 && N.Value != 0xFFFFFFFF)
return {N, true, N.Value};
return std::make_tuple(N, true, N.Value);
if (N.hasChildren()) {
uint32_t ChildOffset = N.ChildrenOffset;
@ -203,14 +203,14 @@ compareNode(uint32_t Offset, StringRef Name, bool Strict,
if (Matches) {
std::reverse_copy(C.Name.begin(), C.Name.end(),
std::back_inserter(Buffer));
return {N, true, Value};
return std::make_tuple(N, true, Value);
}
ChildOffset += C.Size;
if (!C.HasSibling)
break;
}
}
return {N, false, 0};
return std::make_tuple(N, false, 0);
}
static std::tuple<Node, bool, uint32_t>