diff options
Diffstat (limited to 'Source/JavaScriptCore/wtf/OwnArrayPtr.h')
-rw-r--r-- | Source/JavaScriptCore/wtf/OwnArrayPtr.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/Source/JavaScriptCore/wtf/OwnArrayPtr.h b/Source/JavaScriptCore/wtf/OwnArrayPtr.h index f838a7e..6b7c8da 100644 --- a/Source/JavaScriptCore/wtf/OwnArrayPtr.h +++ b/Source/JavaScriptCore/wtf/OwnArrayPtr.h @@ -24,13 +24,9 @@ #include "Assertions.h" #include "Noncopyable.h" #include "NullPtr.h" -#include "OwnPtrCommon.h" -#include "OwnArrayPtrCommon.h" +#include "PassOwnArrayPtr.h" #include <algorithm> -// Remove this once we make all WebKit code compatible with stricter rules about OwnArrayPtr. -#define LOOSE_OWN_ARRAY_PTR - namespace WTF { template<typename T> class PassOwnArrayPtr; @@ -115,16 +111,6 @@ template<typename T> inline typename OwnArrayPtr<T>::PtrType OwnArrayPtr<T>::lea return ptr; } -#ifdef LOOSE_OWN_ARRAY_PTR -template<typename T> inline void OwnArrayPtr<T>::set(PtrType ptr) -{ - ASSERT(!ptr || m_ptr != ptr); - PtrType oldPtr = m_ptr; - m_ptr = ptr; - deleteOwnedPtr(oldPtr); -} -#endif - template<typename T> inline OwnArrayPtr<T>& OwnArrayPtr<T>::operator=(const PassOwnArrayPtr<T>& o) { PtrType ptr = m_ptr; |