Changeset 101521 in webkit for trunk/Source/JavaScriptCore/wtf/RetainPtr.h

Timestamp:

Nov 30, 2011, 8:39:02 AM (14 years ago)

Author:

Adam Roben

Message:

Fix RetainPtr's move assignment operators

Fixes <​http://webkit.org/b/73449> RetainPtr's move assignment operators don't modify the
pointer being assigned to

I didn't write a test for this because we don't have a way of unit testing C++11 code (see
<​http://webkit.org/b/73448>).

Reviewed by Anders Carlsson.

• wtf/RetainPtr.h:

(WTF::RetainPtr::operator=): Adopt the passed-in RetainPtr's underlying pointer, not our own
pointer.

File:

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

trunk/Source/JavaScriptCore/wtf/RetainPtr.h

@@ -187 +187 @@
     template<typename T> inline RetainPtr<T>& RetainPtr<T>::operator=(RetainPtr<T>&& o)
     {
-        adoptCF(leakRef());
+        adoptCF(o.leakRef());
         return *this;
     }
@@ -193 +193 @@
     template<typename T> template<typename U> inline RetainPtr<T>& RetainPtr<T>::operator=(RetainPtr<U>&& o)
     {
-        adoptCF(leakRef());
+        adoptCF(o.leakRef());
         return *this;
     }