Changeset 60417 in webkit for trunk/JavaScriptCore/wtf/OwnArrayPtr.h

Timestamp:

May 30, 2010, 11:27:35 AM (15 years ago)

Author:

Darin Adler

Message:

• wtf/OwnArrayPtr.h:

(WTF::OwnArrayPtr::set): Fix the assertion in here to match the one in OwnPtr.
At some point someone fixed the "asserts when assigning to 0 and the pointer is
already 0" issue in OwnPtr but forgot to do it here.

Reviewed by Sam Weinig.

File:

• trunk/JavaScriptCore/wtf/OwnArrayPtr.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/OwnArrayPtr.h

@@ -1 +1 @@
 /*
- *  Copyright (C) 2006 Apple Computer, Inc.
+ *  Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -36 +36 @@
         T* release() { T* ptr = m_ptr; m_ptr = 0; return ptr; }
 
-        void set(T* ptr) { ASSERT(m_ptr != ptr); safeDelete(); m_ptr = ptr; }
+        // FIXME: This should be renamed to adopt. 
+        void set(T* ptr)
+        {
+            ASSERT(!ptr || m_ptr != ptr);
+            safeDelete();
+            m_ptr = ptr;
+        }
+
         void clear() { safeDelete(); m_ptr = 0; }