From 0e1f5c3820a5d54c0d3328fdf5fddc9dee2a590d Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Thu, 28 Sep 2017 08:50:30 +0000 Subject: 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 --- lib/Lex/MacroArgs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/Lex') 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::value, + static_assert(std::is_trivial::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()); } -- cgit v1.2.3