Changeset 12328 in webkit for trunk/JavaScriptCore/kxmlcore/HashMapPtrSpec.h

Timestamp:

Jan 23, 2006, 10:24:11 PM (19 years ago)

Author:

mjs

Message:

Reviewed by Tim Omernick.

• use classes instead of free functions for extractors, this better matches how other things work and should avoid the need for hacky workarounds on other compilers ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6748

• kjs/array_object.cpp:
• kjs/identifier.cpp:
• kjs/internal.cpp:
• kxmlcore/HashMap.h: (KXMLCore::PairFirstExtractor::extract):
• kxmlcore/HashMapPtrSpec.h: (KXMLCore::):
• kxmlcore/HashSet.h: (KXMLCore::IdentityExtractor::extract):
• kxmlcore/HashTable.h: (KXMLCore::addIterator): (KXMLCore::removeIterator): (KXMLCore::HashTable::add): (KXMLCore::HashTable::isEmptyBucket): (KXMLCore::HashTable::isDeletedBucket): (KXMLCore::HashTable::HashTable): (KXMLCore::HashTable::lookup): (KXMLCore::HashTable::add): (KXMLCore::HashTable::reinsert): (KXMLCore::HashTable::find): (KXMLCore::HashTable::contains): (KXMLCore::HashTable::remove): (KXMLCore::HashTable::allocateTable): (KXMLCore::HashTable::deallocateTable): (KXMLCore::HashTable::expand): (KXMLCore::HashTable::rehash): (KXMLCore::HashTable::clear): (KXMLCore::HashTable::swap): (KXMLCore::HashTable::operator): (KXMLCore::HashTable::checkTableConsistency): (KXMLCore::HashTable::checkTableConsistencyExceptSize): (KXMLCore::HashTable::invalidateIterators):

File:

• trunk/JavaScriptCore/kxmlcore/HashMapPtrSpec.h (modified) (1 diff)

trunk/JavaScriptCore/kxmlcore/HashMapPtrSpec.h

@@ -181 +181 @@
         typedef std::pair<KeyType, MappedType> ValueType;
         typedef typename std::pair<void *, void *> ImplValueType;
-        typedef HashTableIterator<void *, ImplValueType, extractFirst<ImplValueType>, DefaultHash<void *>, PairHashTraits<HashTraits<void *>, HashTraits<void *> >, HashTraits<void *> > ImplIterator;
-        typedef HashTableConstIterator<void *, ImplValueType, extractFirst<ImplValueType>, DefaultHash<void *>, PairHashTraits<HashTraits<void *>, HashTraits<void *> >, HashTraits<void *> > ImplConstIterator;
+        typedef HashTableIterator<void *, ImplValueType, PairFirstExtractor<void *, void*>, DefaultHash<void *>, PairHashTraits<HashTraits<void *>, HashTraits<void *> >, HashTraits<void *> > ImplIterator;
+        typedef HashTableConstIterator<void *, ImplValueType, PairFirstExtractor<void *, void*>, DefaultHash<void *>, PairHashTraits<HashTraits<void *>, HashTraits<void *> >, HashTraits<void *> > ImplConstIterator;
         
         typedef PointerHashIteratorAdapter<P, Q *> iterator;