Changeset 12511 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 31, 2006, 8:33:27 PM (19 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• added deleteAllValues for HashSet as well as HashMap
• fixed conversion from const_iterator to iterator, which I broke a while back

• kxmlcore/HashMap.h: Updated copyright date.
• kxmlcore/HashSet.h: (KXMLCore::deleteAllValues): Added.
• kxmlcore/HashTable.h: (KXMLCore::HashTableIterator::operator const_iterator): Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kxmlcore/HashMap.h (modified) (1 diff)
• kxmlcore/HashSet.h (modified) (2 diffs)
• kxmlcore/HashTable.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-01-31  Darin Adler  <[email protected]>
+
+        Reviewed by Maciej.
+
+        - added deleteAllValues for HashSet as well as HashMap
+        - fixed conversion from const_iterator to iterator, which I broke a while back
+
+        * kxmlcore/HashMap.h: Updated copyright date.
+        * kxmlcore/HashSet.h: (KXMLCore::deleteAllValues): Added.
+        * kxmlcore/HashTable.h: (KXMLCore::HashTableIterator::operator const_iterator): Added.
+
 2006-01-31  Tim Omernick  <[email protected]>
 

trunk/JavaScriptCore/kxmlcore/HashMap.h

@@ -3 +3 @@
  * This file is part of the KDE libraries
  *
- * Copyright (C) 2005 Apple Computer, Inc.
+ * Copyright (C) 2005, 2006 Apple Computer, Inc.
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

trunk/JavaScriptCore/kxmlcore/HashSet.h

@@ -2 +2 @@
 /*
  * This file is part of the KDE libraries
- * Copyright (C) 2005 Apple Computer, Inc.
+ *
+ * Copyright (C) 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -194 +195 @@
     }
 
+    template<typename Value, typename HashFunctions, typename Traits>
+    void deleteAllValues(HashSet<Value, HashFunctions, Traits>& collection)
+    {
+        typedef HashSet<Value, HashFunctions, Traits> T;
+        typename T::iterator end = collection.end();
+        for (typename T::iterator it = collection.begin(); it != end; ++it)
+            delete (*it);
+    }
+
 } // namespace khtml
 

trunk/JavaScriptCore/kxmlcore/HashTable.h

@@ -111 +111 @@
         }
 
-        HashTableConstIterator(const iterator& other)
-            : m_position(other.m_position), m_endPosition(other.m_endPosition)
-        {
-#if CHECK_HASHTABLE_ITERATORS
-            addIterator(other.m_table, this);
-#endif
-        }
-
         // default copy, assignment and destructor are OK if CHECK_HASHTABLE_ITERATORS is 0
 
@@ -232 +224 @@
         bool operator==(const iterator& other) const { return m_iterator == other.m_iterator; }
         bool operator!=(const iterator& other) const { return m_iterator != other.m_iterator; }
+
+        operator const_iterator() const { return m_iterator; }
 
     private: