Changeset 13830 in webkit for trunk/JavaScriptCore/kxmlcore/HashMap.h

Timestamp:

Apr 11, 2006, 9:07:52 PM (19 years ago)

Author:

darin

Message:

JavaScriptCore:

• try to fix Windows build -- HashForward.h was not working

• kxmlcore/HashForward.h: Removed.

• JavaScriptCore.xcodeproj/project.pbxproj: Remove HashForward.h.
• kjs/collector.h: Remove use of HashForward.h.
• kxmlcore/HashCountedSet.h: Remove include of HashForward.h, restore default arguments.
• kxmlcore/HashMap.h: Ditto.
• kxmlcore/HashSet.h: Ditto.

JavaScriptGlue:

• try to fix Windows build

• kxmlcore/HashForward.h: Removed.

WebCore:

• try to fix Windows build

• ForwardingHeaders/kxmlcore/HashForward.h: Removed.
• dom/xml_tokenizer.h: Include another header instead of HashForward.h.
• loader/Cache.h: Ditto.
• page/Page.h: Ditto.
• platform/TransferJob.h: Ditto.

File:

• trunk/JavaScriptCore/kxmlcore/HashMap.h (modified) (2 diffs)

trunk/JavaScriptCore/kxmlcore/HashMap.h

@@ -25 +25 @@
 #define KXMLCORE_HASH_MAP_H
 
-#include "HashForward.h"
 #include "HashTable.h"
 
@@ -32 +31 @@
     template<typename PairType> struct PairFirstExtractor;
 
-    template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg,
-        typename MappedTraitsArg> class HashMap {
+    template<typename KeyArg, typename MappedArg, typename HashArg = typename DefaultHash<KeyArg>::Hash,
+        typename KeyTraitsArg = HashTraits<KeyArg>, typename MappedTraitsArg = HashTraits<MappedArg> >
+    class HashMap {
     private:
         typedef KeyTraitsArg KeyTraits;