Changeset 12328 in webkit for trunk/JavaScriptCore/kxmlcore/HashMap.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/HashMap.h (modified) (2 diffs)

trunk/JavaScriptCore/kxmlcore/HashMap.h

@@ -30 +30 @@
 namespace KXMLCore {
 
-template<typename PairType> 
-inline typename PairType::first_type const& extractFirst(const PairType& value)
-{
-    return value.first;
-}
+template<typename Key, typename Mapped>
+class PairFirstExtractor
+{
+    typedef pair<Key, Mapped> ValueType;
+        
+public:
+    static const Key& extract(const ValueType& value) 
+    { 
+        return value.first;
+    }
+};
 
 template<typename Key, typename Mapped, typename HashFunctions>
@@ -68 +74 @@
     typedef PairHashTraits<KeyTraits, MappedTraits> ValueTraits;
  private:
-    typedef HashTable<KeyType, ValueType, extractFirst<ValueType>, HashFunctions, ValueTraits, KeyTraits> ImplType;
+    typedef HashTable<KeyType, ValueType, PairFirstExtractor<KeyType, MappedType>, HashFunctions, ValueTraits, KeyTraits> ImplType;
     typedef HashMapTranslator<Key, Mapped, HashFunctions> TranslatorType; 
  public: