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

Timestamp:

Oct 12, 2008, 12:51:33 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-12 Anders Carlsson <​[email protected]>

Reviewed by Darin Adler.

Make the append method that takes a Vector more strict - it now requires the elements
of the vector to be appended same type as the elements of the Vector they're being appended to.

This would cause problems when dealing with Vectors containing other Vectors.

• wtf/Vector.h: (WTF::::append):

File:

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

trunk/JavaScriptCore/wtf/Vector.h

@@ -499 +499 @@
         template<typename U> void append(const U&);
         template<typename U> void uncheckedAppend(const U& val);
-        template<typename U, size_t c> void append(const Vector<U, c>&);
+        template<size_t otherCapacity> void append(const Vector<T, otherCapacity>&);
 
         template<typename U> void insert(size_t position, const U*, size_t);
@@ -794 +794 @@
     }
 
-    template<typename T, size_t inlineCapacity> template<typename U, size_t c>
-    inline void Vector<T, inlineCapacity>::append(const Vector<U, c>& val)
+    // This method should not be called append, a better name would be appendElements.
+    // It could also be eliminated entirely, and call sites could just use
+    // appendRange(val.begin(), val.end()).
+    template<typename T, size_t inlineCapacity> template<size_t otherCapacity>
+    inline void Vector<T, inlineCapacity>::append(const Vector<T, otherCapacity>& val)
     {
         append(val.begin(), val.size());