Changeset 83827 in webkit

Timestamp:

Apr 14, 2011, 2:27:47 AM (14 years ago)

Author:

Patrick Gansterer

Message:

2011-04-14 Patrick Gansterer <Patrick Gansterer>

Unreviewed WinCE build fix for r83808.

It seams that the MSVC compiler for WinCE does not handle the friend scope correct.
Add an addtional inline function to StructureTransitionTable to work around this.

• runtime/Structure.h: (JSC::StructureTransitionTable::keyForWeakGCMapFinalizer):
• runtime/StructureTransitionTable.h: (JSC::StructureTransitionTable::WeakGCMapFinalizerCallback::keyForFinalizer):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Structure.h (modified) (1 diff)
• runtime/StructureTransitionTable.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-14  Patrick Gansterer  <[email protected]>
+
+        Unreviewed WinCE build fix for r83808.
+
+        It seams that the MSVC compiler for WinCE does not handle the friend scope correct.
+        Add an addtional inline function to StructureTransitionTable to work around this.
+
+        * runtime/Structure.h:
+        (JSC::StructureTransitionTable::keyForWeakGCMapFinalizer):
+        * runtime/StructureTransitionTable.h:
+        (JSC::StructureTransitionTable::WeakGCMapFinalizerCallback::keyForFinalizer):
+
 2011-04-13  Oliver Hunt  <[email protected]>
 

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -296 +296 @@
     }
 
-    inline StructureTransitionTable::Hash::Key StructureTransitionTable::WeakGCMapFinalizerCallback::keyForFinalizer(void*, Structure* structure)
+    inline StructureTransitionTable::Hash::Key StructureTransitionTable::keyForWeakGCMapFinalizer(void*, Structure* structure)
     {
         return Hash::Key(structure->m_nameInPrevious.get(), structure->m_attributesInPrevious);

trunk/Source/JavaScriptCore/runtime/StructureTransitionTable.h

@@ -75 +75 @@
             return 0;
         }
-        
-        static Hash::Key keyForFinalizer(void* context, Structure*);
+
+        static inline Hash::Key keyForFinalizer(void* context, Structure* structure)
+        {
+            return keyForWeakGCMapFinalizer(context, structure);
+        }
     };
 
     typedef WeakGCMap<Hash::Key, Structure, WeakGCMapFinalizerCallback, Hash, HashTraits> TransitionMap;
+
+    static Hash::Key keyForWeakGCMapFinalizer(void* context, Structure*);
 
 public: