Changeset 155526 in webkit
- Timestamp:
- Sep 11, 2013 7:33:00 AM (11 years ago)
- Location:
- trunk/Source/WTF
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r155521 r155526 1 2013-09-11 Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com> 2 3 OwnPtr: Use copy/move-and-swap for assignment operators 4 https://bugs.webkit.org/show_bug.cgi?id=121154 5 6 Reviewed by Anders Carlsson. 7 8 Rationals: 9 - decrease of repeated code 10 - consistency with RefPtr 11 12 * wtf/OwnPtr.h: 13 (WTF::=): 14 1 15 2013-09-11 Patrick Gansterer <paroga@webkit.org> 2 16 -
trunk/Source/WTF/wtf/OwnPtr.h
r155407 r155526 165 165 template<typename T> inline OwnPtr<T>& OwnPtr<T>::operator=(OwnPtr<T>&& o) 166 166 { 167 PtrType ptr = m_ptr; 168 m_ptr = o.leakPtr(); 169 ASSERT(!ptr || m_ptr != ptr); 170 deleteOwnedPtr(ptr); 171 167 ASSERT(!o || o != m_ptr); 168 auto ptr = std::move(o); 169 swap(ptr); 172 170 return *this; 173 171 } … … 175 173 template<typename T> template<typename U> inline OwnPtr<T>& OwnPtr<T>::operator=(OwnPtr<U>&& o) 176 174 { 177 PtrType ptr = m_ptr; 178 m_ptr = o.leakPtr(); 179 ASSERT(!ptr || m_ptr != ptr); 180 deleteOwnedPtr(ptr); 181 175 ASSERT(!o || o != m_ptr); 176 auto ptr = std::move(o); 177 swap(ptr); 182 178 return *this; 183 179 }
Note: See TracChangeset
for help on using the changeset viewer.