| Index: third_party/WebKit/Source/wtf/HashTable.h
|
| diff --git a/third_party/WebKit/Source/wtf/HashTable.h b/third_party/WebKit/Source/wtf/HashTable.h
|
| index 450f957fb7785e8dc1d182e526d958b2797bb786..960ce29645806ab874149bd7599c469c3806e6e8 100644
|
| --- a/third_party/WebKit/Source/wtf/HashTable.h
|
| +++ b/third_party/WebKit/Source/wtf/HashTable.h
|
| @@ -995,10 +995,10 @@ Value* HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits, Alloca
|
| ValueType* result;
|
| // Assert that we will not use memset on things with a vtable entry. The
|
| // compiler will also check this on some platforms. We would like to check
|
| - // this on the whole value (key-value pair), but IsPolymorphic will return
|
| + // this on the whole value (key-value pair), but std::is_polymorphic will return
|
| // false for a pair of two types, even if one of the components is
|
| // polymorphic.
|
| - static_assert(!Traits::emptyValueIsZero || !IsPolymorphic<KeyType>::value, "empty value cannot be zero for things with a vtable");
|
| + static_assert(!Traits::emptyValueIsZero || !std::is_polymorphic<KeyType>::value, "empty value cannot be zero for things with a vtable");
|
|
|
| #if ENABLE(OILPAN)
|
| static_assert(Allocator::isGarbageCollected
|
|
|