Changeset 203304 in webkit

Timestamp:

Jul 15, 2016, 3:25:43 PM (10 years ago)

Author:

Chris Dumez

Message:

Add move constructor / assignment operator to ListHashSet
​https://bugs.webkit.org/show_bug.cgi?id=159837

Reviewed by Alex Christensen.

Add move constructor / assignment operator to ListHashSet.

• wtf/ListHashSet.h:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/ListHashSet.h (modified) (11 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-07-15  Chris Dumez  <cdumez@apple.com>
+
+        Add move constructor / assignment operator to ListHashSet
+        https://bugs.webkit.org/show_bug.cgi?id=159837
+
+        Reviewed by Alex Christensen.
+
+        Add move constructor / assignment operator to ListHashSet.
+
+        * wtf/ListHashSet.h:
+
 2016-07-15  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WTF/wtf/ListHashSet.h

@@ -20 +20 @@
  */
 
-#ifndef WTF_ListHashSet_h
-#define WTF_ListHashSet_h
+#pragma once
 
 #include <wtf/HashSet.h>
@@ -70 +69 @@
     typedef HashTableAddResult<iterator> AddResult;
 
-    ListHashSet();
+    ListHashSet() = default;
     ListHashSet(const ListHashSet&);
+    ListHashSet(ListHashSet&&) = default;
     ListHashSet& operator=(const ListHashSet&);
+    ListHashSet& operator=(ListHashSet&&) = default;
     ~ListHashSet();
 
@@ -150 +151 @@
 
     HashTable<Node*, Node*, IdentityExtractor, NodeHash, NodeTraits, NodeTraits> m_impl;
-    Node* m_head;
-    Node* m_tail;
+    Node* m_head { nullptr };
+    Node* m_tail { nullptr };
 };
 
@@ -160 +161 @@
     ListHashSetNode(T&& value)
         : m_value(std::forward<T>(value))
-        , m_prev(0)
-        , m_next(0)
     {
     }
 
     ValueArg m_value;
-    ListHashSetNode* m_prev;
-    ListHashSetNode* m_next;
+    ListHashSetNode* m_prev { nullptr };
+    ListHashSetNode* m_next { nullptr };
 };
 
@@ -261 +260 @@
     const_iterator& operator++()
     {
-        ASSERT(m_position != 0);
+        ASSERT(m_position);
         m_position = m_position->m_next;
         return *this;
@@ -308 +307 @@
 
 template<typename T, typename U>
-inline ListHashSet<T, U>::ListHashSet()
-    : m_head(0)
-    , m_tail(0)
-{
-}
-
-template<typename T, typename U>
 inline ListHashSet<T, U>::ListHashSet(const ListHashSet& other)
-    : m_head(0)
-    , m_tail(0)
 {
     for (auto it = other.begin(), end = other.end(); it != end; ++it)
@@ -603 +593 @@
     deleteAllNodes();
     m_impl.clear(); 
-    m_head = 0;
-    m_tail = 0;
+    m_head = nullptr;
+    m_tail = nullptr;
 }
 
@@ -638 +628 @@
 {
     node->m_prev = m_tail;
-    node->m_next = 0;
+    node->m_next = nullptr;
 
     if (m_tail) {
@@ -654 +644 @@
 void ListHashSet<T, U>::prependNode(Node* node)
 {
-    node->m_prev = 0;
+    node->m_prev = nullptr;
     node->m_next = m_head;
 
@@ -687 +677 @@
         return;
 
-    for (Node* node = m_head, *next = m_head->m_next; node; node = next, next = node ? node->m_next : 0)
+    for (Node* node = m_head, *next = m_head->m_next; node; node = next, next = node ? node->m_next : nullptr)
         delete node;
 }
@@ -706 +696 @@
 
 using WTF::ListHashSet;
-
-#endif /* WTF_ListHashSet_h */