JavaScriptCore:
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Apr 2006 04:07:52 +0000 (04:07 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Apr 2006 04:07:52 +0000 (04:07 +0000)
        - 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13830 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
JavaScriptCore/kjs/collector.h
JavaScriptCore/kxmlcore/HashCountedSet.h
JavaScriptCore/kxmlcore/HashForward.h [deleted file]
JavaScriptCore/kxmlcore/HashMap.h
JavaScriptCore/kxmlcore/HashSet.h
JavaScriptGlue/ChangeLog
JavaScriptGlue/kxmlcore/HashForward.h [deleted file]
WebCore/ChangeLog
WebCore/ForwardingHeaders/kxmlcore/HashForward.h [deleted file]
WebCore/dom/xml_tokenizer.h
WebCore/loader/Cache.h
WebCore/page/Page.h
WebCore/platform/TransferJob.h

index b475cd4cc12d9a16b5c483a31580f2f8672bd665..73283fbbf0500c5d423ffc8ec23dd0c4940de4ca 100644 (file)
@@ -1,3 +1,16 @@
+2006-04-11  Darin Adler  <darin@apple.com>
+
+        - 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.
+
 2006-04-11  David Harrison  <harrison@apple.com>
 
         Reviewed by Darin.
index 861f10382b06bc104d2e8cc2ae2b33d64ef1e10e..6f48ca7a28bdd3a9169b9cedb5538abe25856eaf 100644 (file)
@@ -77,7 +77,6 @@
                9303F568099118FA00AD71B8 /* OwnPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 9303F567099118FA00AD71B8 /* OwnPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9303F56A0991190000AD71B8 /* Noncopyable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9303F5690991190000AD71B8 /* Noncopyable.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9303F5A509911A5800AD71B8 /* OwnArrayPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 9303F5A409911A5800AD71B8 /* OwnArrayPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               9304635709EB51E8008855DC /* HashForward.h in Headers */ = {isa = PBXBuildFile; fileRef = 9304635609EB51E8008855DC /* HashForward.h */; settings = {ATTRIBUTES = (Private, ); }; };
                930754C108B0F68000AB3056 /* pcre_compile.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754BF08B0F68000AB3056 /* pcre_compile.c */; };
                930754D008B0F74600AB3056 /* pcre_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754CE08B0F74500AB3056 /* pcre_tables.c */; };
                930754D308B0F76300AB3056 /* pcre_globals.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754D108B0F76200AB3056 /* pcre_globals.c */; };
                9303F567099118FA00AD71B8 /* OwnPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnPtr.h; sourceTree = "<group>"; };
                9303F5690991190000AD71B8 /* Noncopyable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Noncopyable.h; sourceTree = "<group>"; };
                9303F5A409911A5800AD71B8 /* OwnArrayPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnArrayPtr.h; sourceTree = "<group>"; };
-               9304635609EB51E8008855DC /* HashForward.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashForward.h; sourceTree = "<group>"; };
                930754BF08B0F68000AB3056 /* pcre_compile.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = pcre_compile.c; path = pcre/pcre_compile.c; sourceTree = "<group>"; tabWidth = 8; };
                930754CE08B0F74500AB3056 /* pcre_tables.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = pcre_tables.c; path = pcre/pcre_tables.c; sourceTree = "<group>"; tabWidth = 8; };
                930754D108B0F76200AB3056 /* pcre_globals.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = pcre_globals.c; path = pcre/pcre_globals.c; sourceTree = "<group>"; tabWidth = 8; };
                                65D7D19B08F10B5B0015ABD8 /* FastMallocInternal.h */,
                                935AF46909E9D9DB00ACD1D8 /* Forward.h */,
                                657EEBBF094E445E008C9C7B /* HashCountedSet.h */,
-                               9304635609EB51E8008855DC /* HashForward.h */,
                                65DFC92A08EA173A00F7300B /* HashFunctions.h */,
                                65DFC92B08EA173A00F7300B /* HashMap.h */,
                                65DFC92C08EA173A00F7300B /* HashSet.h */,
                                E195679909E7CF1200B89D13 /* UnicodeCategory.h in Headers */,
                                935AF46C09E9D9DB00ACD1D8 /* Forward.h in Headers */,
                                935AF46E09E9D9DB00ACD1D8 /* UnusedParam.h in Headers */,
-                               9304635709EB51E8008855DC /* HashForward.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 64deb2fdc21c910cf1a8f8fe7ad43a5b5715d96d..7a8a72b23e0c5c8a4cfa37f051446522efdfd675 100644 (file)
@@ -25,7 +25,7 @@
 #define KJSCOLLECTOR_H_
 
 #include "value.h"
-#include <kxmlcore/HashForward.h>
+#include <kxmlcore/HashCountedSet.h>
 
 #define KJS_MEM_LIMIT 500000
 
index 840f7afedf2d05e07c163c4676204a6f3bfcc212..7b882a0ea8fa493270bd257dbd98d5ae706d6e49 100644 (file)
@@ -28,7 +28,8 @@
 
 namespace KXMLCore {
 
-    template<typename Value, typename HashFunctions, typename Traits> class HashCountedSet {
+    template<typename Value, typename HashFunctions = typename DefaultHash<Value>::Hash,
+        typename Traits = HashTraits<Value> > class HashCountedSet {
     private:
         typedef HashMap<Value, unsigned, HashFunctions, Traits> ImplType;
     public:
diff --git a/JavaScriptCore/kxmlcore/HashForward.h b/JavaScriptCore/kxmlcore/HashForward.h
deleted file mode 100644 (file)
index 5e7d2e2..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (C) 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
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef KXMLCORE_HASH_FORWARD_H
-#define KXMLCORE_HASH_FORWARD_H
-
-#include "HashTraits.h"
-
-namespace KXMLCore {
-    template<typename Value, typename HashFunctions = typename DefaultHash<Value>::Hash,
-        typename Traits = HashTraits<Value> > class HashCountedSet;
-    template<typename Key, typename Mapped, typename Hash = typename DefaultHash<Key>::Hash,
-        typename KeyTraits = HashTraits<Key>, typename MappedTraits = HashTraits<Mapped> > class HashMap;
-    template<typename Value, typename Hash = typename DefaultHash<Value>::Hash,
-        typename Traits = HashTraits<Value> > class HashSet;
-}
-
-using KXMLCore::HashCountedSet;
-using KXMLCore::HashMap;
-using KXMLCore::HashSet;
-
-#endif
index 770802e64276092a1b4f2bb6f5b28d58492a653b..cdd051528108619a44313ddc12e9b4211c1befd5 100644 (file)
 #ifndef KXMLCORE_HASH_MAP_H
 #define KXMLCORE_HASH_MAP_H
 
-#include "HashForward.h"
 #include "HashTable.h"
 
 namespace KXMLCore {
 
     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;
         typedef MappedTraitsArg MappedTraits;
index 960183a07b8638ef9a55e2864f26d6eff583dcdd..00f49385c2257717cf80f0b701f9c329302add5d 100644 (file)
@@ -24,7 +24,6 @@
 #ifndef KXMLCORE_HASH_SET_H
 #define KXMLCORE_HASH_SET_H
 
-#include "HashForward.h"
 #include "HashTable.h"
 
 namespace KXMLCore {
@@ -35,7 +34,8 @@ namespace KXMLCore {
     template<typename Value, typename HashFunctions, typename Traits>
     void deleteAllValues(HashSet<Value, HashFunctions, Traits>&);
 
-    template<typename ValueArg, typename HashArg, typename TraitsArg> class HashSet {
+    template<typename ValueArg, typename HashArg = typename DefaultHash<ValueArg>::Hash,
+        typename TraitsArg = HashTraits<ValueArg> > class HashSet {
     private:
         typedef HashArg HashFunctions;
         typedef TraitsArg ValueTraits;
index d8619477b9507d57798a87c294547b3ea4a934ce..b00944d1bb7ea10c6ddd933981860f534d486cbe 100644 (file)
@@ -1,3 +1,9 @@
+2006-04-11  Darin Adler  <darin@apple.com>
+
+        - try to fix Windows build
+
+        * kxmlcore/HashForward.h: Removed.
+
 2006-04-10  Darin Adler  <darin@apple.com>
 
         Rubber-stamped by John Sullivan.
diff --git a/JavaScriptGlue/kxmlcore/HashForward.h b/JavaScriptGlue/kxmlcore/HashForward.h
deleted file mode 100644 (file)
index bf77f4a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/HashForward.h>
index a42d4fd53aa6e3834ef59a140453a08985e6973b..cbd1362398905ccb9d248cb054073c6908514a14 100644 (file)
@@ -1,3 +1,13 @@
+2006-04-11  Darin Adler  <darin@apple.com>
+
+        - 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.
+
 2006-04-11  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by harrison
diff --git a/WebCore/ForwardingHeaders/kxmlcore/HashForward.h b/WebCore/ForwardingHeaders/kxmlcore/HashForward.h
deleted file mode 100644 (file)
index bf77f4a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/HashForward.h>
index a6617cc36e81426aa09c1ff26f1cd88e7656a5c5..ba2ca696cf4446b9a0d467574950a36b851f77be 100644 (file)
@@ -25,7 +25,7 @@
 #define XML_Tokenizer_h_
 
 #include "StringHash.h"
-#include <kxmlcore/HashForward.h>
+#include <kxmlcore/HashMap.h>
 
 namespace WebCore {
 
index ea48a8a7fe69ec90cb8205a187ba6a6b1044c4e1..fb3eb4b6aaae687ed7e12ef5c25ecab3c9fddf6e 100644 (file)
@@ -30,7 +30,7 @@
 #include "PlatformString.h"
 #include <kio/global.h>
 #include <qptrlist.h>
-#include <kxmlcore/HashForward.h>
+#include <kxmlcore/HashSet.h>
 
 class KURL;
 
index 06267ea681d3d6807ac2d72d36844542e9bac949..b75942b4dae122a1c4c657c81c51555f1cec12ab 100644 (file)
@@ -22,7 +22,7 @@
 #define PAGE_H
 
 #include "PlatformString.h"
-#include <kxmlcore/HashForward.h>
+#include <kxmlcore/HashSet.h>
 
 #if __APPLE__
 #ifdef __OBJC__
index dfc47c4a9373b8949a85ecfacca2c9d67ddbb0b0..f5bc1ff5d173825650230141a5aceea6a8684151 100644 (file)
@@ -29,7 +29,7 @@
 #include "StringHash.h"
 #include "Timer.h"
 #include "TransferJobClient.h" // for PlatformResponse
-#include <kxmlcore/HashForward.h>
+#include <kxmlcore/HashMap.h>
 
 #ifdef WIN32
 typedef unsigned long DWORD;