Changeset 12232 in webkit for trunk/JavaScriptCore/kxmlcore/HashTraits.h

Timestamp:

Jan 19, 2006, 12:59:03 AM (19 years ago)

Author:

darin

Message:

Reviewed by Hyatt.

• hash table fixes needed for my WebCore changes

• kxmlcore/HashTable.h: (KXMLCore::HashTableConstIterator::operator=): Added a missing return statement.

• kxmlcore/HashTraits.h: Fix traits so they work properly for classes where you can't instantiate with a 0 by using traits rather than ? : to select the default emtpy value of hash table keys.

• small cleanup of "runtime" code left over from recent JavaScript crash fix

• bindings/runtime_root.h: (KJS::Bindings::RootObject::RootObject): No explicit initialization of _imp needed since it's now a ProtectedPtr. (KJS::Bindings::RootObject::setRootObjectImp): Remove old code that relied on the fact that _imp was 0 and replaced with use of ProtectedPtr. (KJS::Bindings::RootObject::rootObjectImp): Updated since _imp is a ProtectedPtr.

File:

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

trunk/JavaScriptCore/kxmlcore/HashTraits.h

@@ -45 +45 @@
     template <> struct IsInteger<unsigned long long> { static const bool value = true; };
 
-    template<typename T> struct GenericHashTraits {
+    template<bool isInteger, typename T> struct GenericHashTraitsBase;
+    template<typename T> struct GenericHashTraitsBase<true, T> {
         typedef T TraitType;
-        static const bool emptyValueIsZero = IsInteger<T>::value;
-        static const bool needsDestruction = !IsInteger<T>::value;
-        static TraitType emptyValue() { return IsInteger<T>::value ? 0 : TraitType(); }
+        static const bool emptyValueIsZero = true;
+        static const bool needsDestruction = false;
+        static TraitType emptyValue() { return 0; }
     };
+    template<typename T> struct GenericHashTraitsBase<false, T> {
+        typedef T TraitType;
+        static const bool emptyValueIsZero = false;
+        static const bool needsDestruction = true;
+        static TraitType emptyValue() { return TraitType(); }
+    };
+
+    template<typename T> struct GenericHashTraits : GenericHashTraitsBase<IsInteger<T>::value, T> { };
 
     template<typename T> struct HashTraits : GenericHashTraits<T> { };