Changeset 155526 in webkit

Timestamp:

Sep 11, 2013 7:33:00 AM (11 years ago)

Author:

mikhail.pozdnyakov@intel.com

Message:

OwnPtr: Use copy/move-and-swap for assignment operators
​https://bugs.webkit.org/show_bug.cgi?id=121154

Reviewed by Anders Carlsson.

Rationals:

• decrease of repeated code
• consistency with RefPtr

• wtf/OwnPtr.h:

(WTF::=):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/OwnPtr.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-09-11  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        OwnPtr: Use copy/move-and-swap for assignment operators
+        https://bugs.webkit.org/show_bug.cgi?id=121154
+
+        Reviewed by Anders Carlsson.
+
+        Rationals:
+        - decrease of repeated code
+        - consistency with RefPtr
+
+        * wtf/OwnPtr.h:
+        (WTF::=):
+
 2013-09-11  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WTF/wtf/OwnPtr.h

@@ -165 +165 @@
     template<typename T> inline OwnPtr<T>& OwnPtr<T>::operator=(OwnPtr<T>&& o)
     {
-        PtrType ptr = m_ptr;
-        m_ptr = o.leakPtr();
-        ASSERT(!ptr || m_ptr != ptr);
-        deleteOwnedPtr(ptr);
-
+        ASSERT(!o || o != m_ptr);
+        auto ptr = std::move(o);
+        swap(ptr);
         return *this;
     }
@@ -175 +173 @@
     template<typename T> template<typename U> inline OwnPtr<T>& OwnPtr<T>::operator=(OwnPtr<U>&& o)
     {
-        PtrType ptr = m_ptr;
-        m_ptr = o.leakPtr();
-        ASSERT(!ptr || m_ptr != ptr);
-        deleteOwnedPtr(ptr);
-
+        ASSERT(!o || o != m_ptr);
+        auto ptr = std::move(o);
+        swap(ptr);
         return *this;
     }