diff options
| author | Mikael Holmen <mikael.holmen@ericsson.com> | 2021-01-21 14:04:44 +0100 |
|---|---|---|
| committer | Mikael Holmen <mikael.holmen@ericsson.com> | 2021-01-21 14:05:14 +0100 |
| commit | 2b4716d6dff1c9a5e64b3487a0b2388e3ff18b30 (patch) | |
| tree | 03f06e5c24131a4f7c68089fd0ede71d4c73dff8 /llvm/lib/MC/MCDwarf.cpp | |
| parent | 4ef38f9c1255dcaa3f834cf376e55f8a7bdc5810 (diff) | |
| download | llvm-2b4716d6dff1c9a5e64b3487a0b2388e3ff18b30.zip llvm-2b4716d6dff1c9a5e64b3487a0b2388e3ff18b30.tar.gz llvm-2b4716d6dff1c9a5e64b3487a0b2388e3ff18b30.tar.bz2 | |
[MC] Use std::make_tuple to make some toolchains happy again
My toolchain (LLVM 8.0, libstdc++ 5.4.0) complained with:
12:27:43 ../lib/MC/MCDwarf.cpp:814:10: error: chosen constructor is explicit in copy-initialization
12:27:43 return {Offset, Size, SetDelta};
12:27:43 ^~~~~~~~~~~~~~~~~~~~~~~~
12:27:43 /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
12:27:43 constexpr tuple(_UElements&&... __elements)
12:27:43 ^
12:27:43 1 error generated.
This commit adds explicit calls to std::make_tuple to work around
the problem.
Diffstat (limited to 'llvm/lib/MC/MCDwarf.cpp')
| -rw-r--r-- | llvm/lib/MC/MCDwarf.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/MC/MCDwarf.cpp b/llvm/lib/MC/MCDwarf.cpp index 410ca29..f86d426 100644 --- a/llvm/lib/MC/MCDwarf.cpp +++ b/llvm/lib/MC/MCDwarf.cpp @@ -811,7 +811,7 @@ MCDwarfLineAddr::fixedEncode(MCContext &Context, int64_t LineDelta, OS << char(dwarf::DW_LNS_copy); } - return {Offset, Size, SetDelta}; + return std::make_tuple(Offset, Size, SetDelta); } // Utility function to write a tuple for .debug_abbrev. |