| Index: Source/wtf/VectorTraits.h
|
| diff --git a/Source/wtf/VectorTraits.h b/Source/wtf/VectorTraits.h
|
| index 50f41a1f30d4358932126744712aa7311d9000fb..c1d68b88db11995dc6137082e8e27f5d57a5fd7a 100644
|
| --- a/Source/wtf/VectorTraits.h
|
| +++ b/Source/wtf/VectorTraits.h
|
| @@ -75,12 +75,12 @@ namespace WTF {
|
| // is "trivially copyable".
|
| static const bool canCopyWithMemcpy = false;
|
| };
|
| - COMPILE_ASSERT(VectorTraits<RefPtr<int> >::canInitializeWithMemset, inefficientRefPtrVector);
|
| - COMPILE_ASSERT(VectorTraits<RefPtr<int> >::canMoveWithMemcpy, inefficientRefPtrVector);
|
| - COMPILE_ASSERT(VectorTraits<RefPtr<int> >::canCompareWithMemcmp, inefficientRefPtrVector);
|
| - COMPILE_ASSERT(VectorTraits<OwnPtr<int> >::canInitializeWithMemset, inefficientOwnPtrVector);
|
| - COMPILE_ASSERT(VectorTraits<OwnPtr<int> >::canMoveWithMemcpy, inefficientOwnPtrVector);
|
| - COMPILE_ASSERT(VectorTraits<OwnPtr<int> >::canCompareWithMemcmp, inefficientOwnPtrVector);
|
| + static_assert(VectorTraits<RefPtr<int> >::canInitializeWithMemset, "inefficientRefPtrVector");
|
| + static_assert(VectorTraits<RefPtr<int> >::canMoveWithMemcpy, "inefficientRefPtrVector");
|
| + static_assert(VectorTraits<RefPtr<int> >::canCompareWithMemcmp, "inefficientRefPtrVector");
|
| + static_assert(VectorTraits<OwnPtr<int> >::canInitializeWithMemset, "inefficientOwnPtrVector");
|
| + static_assert(VectorTraits<OwnPtr<int> >::canMoveWithMemcpy, "inefficientOwnPtrVector");
|
| + static_assert(VectorTraits<OwnPtr<int> >::canCompareWithMemcmp, "inefficientOwnPtrVector");
|
|
|
| template<typename First, typename Second>
|
| struct VectorTraits<pair<First, Second> >
|
| @@ -105,14 +105,14 @@ namespace WTF {
|
|
|
| #define WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(ClassName) \
|
| namespace WTF { \
|
| -COMPILE_ASSERT(!IsTriviallyDefaultConstructible<ClassName>::value || !IsTriviallyCopyAssignable<ClassName>::value, macro_not_needed); \
|
| +static_assert(!IsTriviallyDefaultConstructible<ClassName>::value || !IsTriviallyCopyAssignable<ClassName>::value, "macro_not_needed"); \
|
| template<> \
|
| struct VectorTraits<ClassName> : SimpleClassVectorTraits<ClassName> { }; \
|
| }
|
|
|
| #define WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(ClassName) \
|
| namespace WTF { \
|
| -COMPILE_ASSERT(!WTF::IsTriviallyDefaultConstructible<ClassName>::value || !IsTriviallyCopyAssignable<ClassName>::value, macro_not_needed); \
|
| +static_assert(!WTF::IsTriviallyDefaultConstructible<ClassName>::value || !IsTriviallyCopyAssignable<ClassName>::value, "macro_not_needed"); \
|
| template<> \
|
| struct VectorTraits<ClassName> : VectorTraitsBase<ClassName> \
|
| { \
|
| @@ -123,7 +123,7 @@ COMPILE_ASSERT(!WTF::IsTriviallyDefaultConstructible<ClassName>::value || !IsTri
|
|
|
| #define WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(ClassName) \
|
| namespace WTF { \
|
| -COMPILE_ASSERT(!WTF::IsTriviallyDefaultConstructible<ClassName>::value, macro_not_needed); \
|
| +static_assert(!WTF::IsTriviallyDefaultConstructible<ClassName>::value, "macro_not_needed"); \
|
| template<> \
|
| struct VectorTraits<ClassName> : VectorTraitsBase<ClassName> \
|
| { \
|
|
|