From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/JavaScriptCore/wtf/PassOwnArrayPtr.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/JavaScriptCore/wtf/PassOwnArrayPtr.h') diff --git a/Source/JavaScriptCore/wtf/PassOwnArrayPtr.h b/Source/JavaScriptCore/wtf/PassOwnArrayPtr.h index e1aa61e..3f30924 100644 --- a/Source/JavaScriptCore/wtf/PassOwnArrayPtr.h +++ b/Source/JavaScriptCore/wtf/PassOwnArrayPtr.h @@ -30,9 +30,6 @@ #include "NullPtr.h" #include "TypeTraits.h" -// Remove this once we make all WebKit code compatible with stricter rules about PassOwnArrayPtr. -#define LOOSE_PASS_OWN_ARRAY_PTR - namespace WTF { template class OwnArrayPtr; @@ -46,6 +43,10 @@ public: PassOwnArrayPtr() : m_ptr(0) { } +#if !defined(LOOSE_PASS_OWN_PTR) || !HAVE(NULLPTR) + PassOwnArrayPtr(std::nullptr_t) : m_ptr(0) { } +#endif + // It somewhat breaks the type system to allow transfer of ownership out of // a const PassOwnArrayPtr. However, it makes it much easier to work with PassOwnArrayPtr // temporaries, and we don't have a need to use real const PassOwnArrayPtrs anyway. -- cgit v1.1