Changeset 28132 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 28, 2007, 10:04:21 PM (18 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff

Add copyKeysToVector utility, mirroring copyValuesToVector
Also change the copyValuesToVector implementation to be a little more attractive

• wtf/HashMap.h: (WTF::copyKeysToVector): (WTF::copyValuesToVector):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/HashMap.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-11-28  Brady Eidson <[email protected]>
+
+        Reviewed by Geoff
+
+        Add copyKeysToVector utility, mirroring copyValuesToVector
+        Also change the copyValuesToVector implementation to be a little more attractive
+
+        * wtf/HashMap.h:
+        (WTF::copyKeysToVector):
+        (WTF::copyValuesToVector):
+
 2007-11-27  Alp Toker  <[email protected]>
 

trunk/JavaScriptCore/wtf/HashMap.h

@@ -395 +395 @@
     
     template<typename T, typename U, typename V, typename W, typename X>
-    inline void copyValuesToVector(const HashMap<T, U, V, W, X>& collection, Vector<U>& vector)
-    {
-        typedef typename HashMap<T, U, V, W, X>::const_iterator iterator;
+    inline void copyKeysToVector(const HashMap<T, U, V, W, X>& collection, Vector<T>& vector)
+    {
+        typedef typename HashMap<T, U, V, W, X>::const_iterator::Keys iterator;
         
         vector.resize(collection.size());
         
-        iterator it = collection.begin();
-        iterator end = collection.end();
+        iterator it = collection.begin().keys();
+        iterator end = collection.end().keys();
         for (unsigned i = 0; it != end; ++it, ++i)
-            vector[i] = (*it).second;
+            vector[i] = *it;
+    }  
+
+    template<typename T, typename U, typename V, typename W, typename X>
+    inline void copyValuesToVector(const HashMap<T, U, V, W, X>& collection, Vector<U>& vector)
+    {
+        typedef typename HashMap<T, U, V, W, X>::const_iterator::Values iterator;
+        
+        vector.resize(collection.size());
+        
+        iterator it = collection.begin().values();
+        iterator end = collection.end().values();
+        for (unsigned i = 0; it != end; ++it, ++i)
+            vector[i] = *it;
     }