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

Timestamp:

Nov 29, 2011, 9:42:14 PM (14 years ago)

Author:

[email protected]

Message:

Add move semantics to RetainPtr
​https://bugs.webkit.org/show_bug.cgi?id=73393

Reviewed by Anders Carlsson.

• wtf/RetainPtr.h:

(WTF::RetainPtr::RetainPtr):
Add a move constructor and move enabled assignment operators
to RetainPtr if the compiler being used supports rvalue
references. If the compiler does not support it, we fallback
to the copy semantics we have always had.

File:

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

trunk/Source/JavaScriptCore/wtf/RetainPtr.h

@@ -66 +66 @@
         RetainPtr(const RetainPtr& o) : m_ptr(o.m_ptr) { if (PtrType ptr = m_ptr) CFRetain(ptr); }
 
+#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
+        RetainPtr(RetainPtr&& o) : m_ptr(o.leakRef()) { }
+#endif
+
         // Hash table deleted values, which are only constructed and never copied or destroyed.
         RetainPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { }
@@ -91 +95 @@
         RetainPtr& operator=(PtrType);
         template<typename U> RetainPtr& operator=(U*);
+
+#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
+        RetainPtr& operator=(RetainPtr&&);
+        template<typename U> RetainPtr& operator=(RetainPtr<U>&&);
+#endif
+
 #if !HAVE(NULLPTR)
         RetainPtr& operator=(std::nullptr_t) { clear(); return *this; }
@@ -154 +164 @@
         return *this;
     }
-    
+
     template<typename T> inline RetainPtr<T>& RetainPtr<T>::operator=(PtrType optr)
     {
@@ -166 +176 @@
     }
 
+    template<typename T> template<typename U> inline RetainPtr<T>& RetainPtr<T>::operator=(U* optr)
+    {
+        if (optr)
+            CFRetain(optr);
+        PtrType ptr = m_ptr;
+        m_ptr = optr;
+        if (ptr)
+            CFRelease(ptr);
+        return *this;
+    }
+
+#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
+    template<typename T> inline RetainPtr<T>& RetainPtr<T>::operator=(RetainPtr<T>&& o)
+    {
+        adoptCF(leakRef());
+        return *this;
+    }
+    
+    template<typename T> template<typename U> inline RetainPtr<T>& RetainPtr<T>::operator=(RetainPtr<U>&& o)
+    {
+        adoptCF(leakRef());
+        return *this;
+    }
+#endif
+
     template<typename T> inline void RetainPtr<T>::adoptCF(PtrType optr)
     {
@@ -183 +218 @@
             CFRelease(ptr);
     }
-    
-    template<typename T> template<typename U> inline RetainPtr<T>& RetainPtr<T>::operator=(U* optr)
-    {
-        if (optr)
-            CFRetain(optr);
-        PtrType ptr = m_ptr;
-        m_ptr = optr;
-        if (ptr)
-            CFRelease(ptr);
-        return *this;
-    }
 
     template<typename T> inline void RetainPtr<T>::swap(RetainPtr<T>& o)
@@ -234 +258 @@
         return a != b.get(); 
     }
-    
+
     template<typename P> struct HashTraits<RetainPtr<P> > : SimpleClassHashTraits<RetainPtr<P> > { };