Changeset 17200 in webkit for trunk/JavaScriptCore/wtf/Vector.h

Timestamp:

Oct 21, 2006, 6:55:53 PM (19 years ago)

Author:

darin

Message:

Reviewed by Anders.

• ​http://bugs.webkit.org/show_bug.cgi?id=11377 swap(Vector, Vector) should be O(1) instead of O(n)

• wtf/Vector.h: (WTF::VectorBuffer::swap): Added. (WTF::Vector::swap): Added. (WTF::swap): Added overload that takes two Vector objects.

File:

• trunk/JavaScriptCore/wtf/Vector.h (modified) (7 diffs)

trunk/JavaScriptCore/wtf/Vector.h

@@ -83 +83 @@
         static void initialize(T* begin, T* end) 
         {
-            memset(begin, 0, reinterpret_cast<char *>(end) - reinterpret_cast<char *>(begin));
+            memset(begin, 0, reinterpret_cast<char*>(end) - reinterpret_cast<char*>(begin));
         }
     };
@@ -123 +123 @@
         static void move(const T* src, const T* srcEnd, T* dst) 
         {
-            memcpy(dst, src, reinterpret_cast<const char *>(srcEnd) - reinterpret_cast<const char *>(src));
+            memcpy(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src));
         }
         static void moveOverlapping(const T* src, const T* srcEnd, T* dst) 
         {
-            memmove(dst, src, reinterpret_cast<const char *>(srcEnd) - reinterpret_cast<const char *>(src));
+            memmove(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src));
         }
     };
@@ -152 +152 @@
         static void uninitializedCopy(const T* src, const T* srcEnd, T* dst) 
         {
-            memcpy(dst, src, reinterpret_cast<const char *>(srcEnd) - reinterpret_cast<const char *>(src));
+            memcpy(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src));
         }
     };
@@ -256 +256 @@
         const T* buffer() const { return m_buffer; }
         size_t capacity() const { return m_capacity; }
+
+        void swap(VectorBuffer<T, 0>& other)
+        {
+            std::swap(m_capacity, other.m_capacity);
+            std::swap(m_buffer, other.m_buffer);
+        }
 
         T* releaseBuffer()
@@ -318 +324 @@
         }
 
+        void swap(VectorBuffer<T, inlineCapacity>&);
+
     private:
         static const size_t m_inlineBufferSize = inlineCapacity * sizeof(T);
         T* inlineBuffer() { return reinterpret_cast<T*>(&m_inlineBuffer); }
 
+        // FIXME: Nothing guarantees this buffer is appropriately aligned to hold objects of type T.
         char m_inlineBuffer[m_inlineBufferSize];
     };
@@ -428 +437 @@
         }
 
-        void fill(const T& val, size_t size);
+        void fill(const T&, size_t);
         void fill(const T& val) { fill(val, size()); }
 
         T* releaseBuffer();
+
+        void swap(Vector<T, inlineCapacity>& other)
+        {
+            std::swap(m_size, other.m_size);
+            m_impl.swap(other.m_impl);
+        }
 
     private:
@@ -646 +661 @@
     }
 
+    template<typename T, size_t inlineCapacity>
+    inline void swap(Vector<T, inlineCapacity>& a, Vector<T, inlineCapacity>& b)
+    {
+        a.swap(b);
+    }
+
 } // namespace WTF