Cherry pick webkit change r95090 to fix HashMap/StringHash include problems

Change-Id: I61f2cc831b962913b0cf8ac9ace8fdfe6f3d05c0

2 files changed, 3 insertions, 2 deletions

diff --git a/Source/JavaScriptCore/wtf/HashTraits.h b/Source/JavaScriptCore/wtf/HashTraits.h
index fba5afe..7deeb3a 100644
--- a/Source/JavaScriptCore/wtf/HashTraits.h
+++ b/Source/JavaScriptCore/wtf/HashTraits.h
@@ -28,6 +28,8 @@
 
 namespace WTF {
 
+    class String;
+
     using std::pair;
     using std::make_pair;
 
@@ -88,6 +90,7 @@ namespace WTF {
     };
 
     template<typename P> struct HashTraits<RefPtr<P> > : SimpleClassHashTraits<RefPtr<P> > { };
+    template<> struct HashTraits<String> : SimpleClassHashTraits<String> { };
 
     // special traits for pairs, helpful for their use in HashMap implementation
 
diff --git a/Source/JavaScriptCore/wtf/text/StringHash.h b/Source/JavaScriptCore/wtf/text/StringHash.h
index c47c1d8..497184d 100644
--- a/Source/JavaScriptCore/wtf/text/StringHash.h
+++ b/Source/JavaScriptCore/wtf/text/StringHash.h
@@ -179,8 +179,6 @@ namespace WTF {
         }
     };
 
-    template<> struct HashTraits<String> : SimpleClassHashTraits<String> { };
-
 }
 
 using WTF::StringHash;