diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2017-09-28 08:50:30 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2017-09-28 08:50:30 +0000 |
| commit | 0e1f5c3820a5d54c0d3328fdf5fddc9dee2a590d (patch) | |
| tree | c5cb510ea68329be108f8c88e58770b58fd861d6 /lib/Lex | |
| parent | 7f9a0349abc6c2b840aa5218afb118ca14f71c4d (diff) | |
Use std::is_trivial instead of is_trivially_copyable.
The oldest versions of GCC we support (before 5) didn't support that
trait. is_trivial is stronger superset that clang::Token fulfills, so
just use that instead.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@314391 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex')
| -rw-r--r-- | lib/Lex/MacroArgs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Lex/MacroArgs.cpp b/lib/Lex/MacroArgs.cpp index b96b1a8995..37a7d5c1ff 100644 --- a/lib/Lex/MacroArgs.cpp +++ b/lib/Lex/MacroArgs.cpp @@ -62,11 +62,11 @@ MacroArgs *MacroArgs::create(const MacroInfo *MI, // Copy the actual unexpanded tokens to immediately after the result ptr. if (!UnexpArgTokens.empty()) { - static_assert(std::is_trivially_copyable<Token>::value, + static_assert(std::is_trivial<Token>::value, "assume trivial copyability if copying into the " "uninitialized array (as opposed to reusing a cached " "MacroArgs)"); - std::copy(UnexpArgTokens.begin(), UnexpArgTokens.end(), + std::copy(UnexpArgTokens.begin(), UnexpArgTokens.end(), Result->getTrailingObjects<Token>()); } |