| 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 a6659991bec020f3a179719c8a11d9195301f1c7..20ab1d1a8f2020ce099666b065df80f2e324e90b 100644
|
| --- a/third_party/WebKit/Source/wtf/HashTable.h
|
| +++ b/third_party/WebKit/Source/wtf/HashTable.h
|
| @@ -1,5 +1,6 @@
|
| /*
|
| - * Copyright (C) 2005, 2006, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
|
| + * Copyright (C) 2005, 2006, 2007, 2008, 2011, 2012 Apple Inc. All rights
|
| + * reserved.
|
| * Copyright (C) 2008 David Levin <levin@chromium.org>
|
| *
|
| * This library is free software; you can redistribute it and/or
|
| @@ -8,7 +9,9 @@
|
| * version 2 of the License, or (at your option) any later version.
|
| *
|
| * This library is distributed in the hope that it will be useful,
|
| - * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details.
|
| + * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library
|
| + * General Public License for more details.
|
| *
|
| * You should have received a copy of the GNU Library General Public License
|
| * along with this library; see the file COPYING.LIB. If not, write to
|
| @@ -1501,8 +1504,8 @@ HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits, Allocator>::
|
| 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 std::is_polymorphic will return
|
| - // false for a pair of two types, even if one of the components is
|
| + // 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 || !std::is_polymorphic<KeyType>::value,
|
|
|