Changeset 95090 in webkit

Timestamp:

Sep 14, 2011 7:20:45 AM (13 years ago)

Author:

steveblock@google.com

Message:

HashTraits.h should include template specialization for WTF::String
​https://bugs.webkit.org/show_bug.cgi?id=67851

Ensure that the template specialization for HashTraits<String> is always
picked up. (Previously it was possible to include HashSet and String but
not the correct HashTraits, so you would get an inefficient template
instantiation.)

Patch by Iain Merrick <​husky@google.com> on 2011-09-14
Reviewed by Darin Adler.

• wtf/HashTraits.h:
• wtf/text/StringHash.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/HashTraits.h (modified) (2 diffs)
• wtf/text/StringHash.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-14  Iain Merrick  <husky@google.com>
+
+        HashTraits.h should include template specialization for WTF::String
+        https://bugs.webkit.org/show_bug.cgi?id=67851
+
+        Ensure that the template specialization for HashTraits<String> is always
+        picked up. (Previously it was possible to include HashSet and String but
+        not the correct HashTraits, so you would get an inefficient template
+        instantiation.)
+
+        Reviewed by Darin Adler.
+
+        * wtf/HashTraits.h:
+        * wtf/text/StringHash.h:
+
 2011-09-13  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/wtf/HashTraits.h

@@ -28 +28 @@
 
 namespace WTF {
+
+    class String;
 
     using std::pair;
@@ -90 +92 @@
 
     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

trunk/Source/JavaScriptCore/wtf/text/StringHash.h

@@ -180 +180 @@
     };
 
-    template<> struct HashTraits<String> : SimpleClassHashTraits<String> { };
-
 }