Changeset 38392 in webkit

Timestamp:

Nov 14, 2008 9:54:07 AM (15 years ago)

Author:

Simon Hausmann

Message:

2008-11-14 Kristian Amlie <​kristian.amlie@trolltech.com>

Reviewed by Darin Adler.

Compile fix for RVCT.

In reality, it is two fixes:

1. Remove typename. I believe typename can only be used when the named type depends on the template parameters, which it doesn't in this case, so I think this is more correct.
2. Replace ::iterator scope with specialized typedef. This is to work around a bug in RVCT.

​https://bugs.webkit.org/show_bug.cgi?id=22260

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/ListHashSet.h (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-11-14  Kristian Amlie  <kristian.amlie@trolltech.com>
+
+        Reviewed by Darin Adler.
+
+        Compile fix for RVCT.
+
+        In reality, it is two fixes:
+
+        1. Remove typename. I believe typename can only be used when the named
+        type depends on the template parameters, which it doesn't in this
+        case, so I think this is more correct.
+        2. Replace ::iterator scope with specialized typedef. This is to work
+        around a bug in RVCT.
+
+        https://bugs.webkit.org/show_bug.cgi?id=22260
+
+        * wtf/ListHashSet.h:
+        (WTF::::find):
+
 2008-11-14  Kristian Amlie  <kristian.amlie@trolltech.com>
 

trunk/JavaScriptCore/wtf/ListHashSet.h

@@ -61 +61 @@
 
         typedef HashTable<Node*, Node*, IdentityExtractor<Node*>, NodeHash, NodeTraits, NodeTraits> ImplType;
+        typedef HashTableIterator<Node*, Node*, IdentityExtractor<Node*>, NodeHash, NodeTraits, NodeTraits> ImplTypeIterator;
+        typedef HashTableConstIterator<Node*, Node*, IdentityExtractor<Node*>, NodeHash, NodeTraits, NodeTraits> ImplTypeConstIterator;
 
         typedef HashArg HashFunctions;
@@ -442 +444 @@
     {
         typedef ListHashSetTranslator<ValueType, HashFunctions> Translator;
-        typename ImplType::iterator it = m_impl.template find<ValueType, Translator>(value);
+        ImplTypeIterator it = m_impl.template find<ValueType, Translator>(value);
         if (it == m_impl.end())
             return end();
@@ -452 +454 @@
     {
         typedef ListHashSetTranslator<ValueType, HashFunctions> Translator;
-        typename ImplType::const_iterator it = m_impl.template find<ValueType, Translator>(value);
+        ImplTypeConstIterator it = m_impl.template find<ValueType, Translator>(value);
         if (it == m_impl.end())
             return end();