summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2017-09-28 08:50:30 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2017-09-28 08:50:30 +0000
commit32c99824a0619808846b9e7423cc026cc3f67b4e (patch)
tree523e2c16c5e5de572d15120b8ce6b3ae519b2a64 /clang/lib
parent79c0bec06ee471b41b97d17c7fb6297f15eb2b19 (diff)
downloadbcm5719-llvm-32c99824a0619808846b9e7423cc026cc3f67b4e.tar.gz
bcm5719-llvm-32c99824a0619808846b9e7423cc026cc3f67b4e.zip
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. llvm-svn: 314391
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Lex/MacroArgs.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Lex/MacroArgs.cpp b/clang/lib/Lex/MacroArgs.cpp
index b96b1a8995f..37a7d5c1fff 100644
--- a/clang/lib/Lex/MacroArgs.cpp
+++ b/clang/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>());
}
OpenPOWER on IntegriCloud