summaryrefslogtreecommitdiffstats
path: root/lib/Lex/MacroArgs.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Lex/MacroArgs.cpp')
-rw-r--r--lib/Lex/MacroArgs.cpp4
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>());
}