Index: Source/wtf/VectorTraits.h |
diff --git a/Source/wtf/VectorTraits.h b/Source/wtf/VectorTraits.h |
index 50f41a1f30d4358932126744712aa7311d9000fb..667992f0292cff6720edf76c6647449b39591002 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, "inefficient RefPtr Vector"); |
+ static_assert(VectorTraits<RefPtr<int>>::canMoveWithMemcpy, "inefficient RefPtr Vector"); |
+ static_assert(VectorTraits<RefPtr<int>>::canCompareWithMemcmp, "inefficient RefPtr Vector"); |
+ static_assert(VectorTraits<OwnPtr<int>>::canInitializeWithMemset, "inefficient OwnPtr Vector"); |
+ static_assert(VectorTraits<OwnPtr<int>>::canMoveWithMemcpy, "inefficient OwnPtr Vector"); |
+ static_assert(VectorTraits<OwnPtr<int>>::canCompareWithMemcmp, "inefficient OwnPtr Vector"); |
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> \ |
{ \ |