Changeset 33979 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

Location:

trunk/JavaScriptCore/wtf

Files:

• Platform.h (modified) (1 diff)
• Vector.h (modified) (4 diffs)
• VectorTraits.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/Platform.h

@@ -243 +243 @@
 #endif
 
+#if COMPILER(GCC)
+#define HAVE_COMPUTED_GOTO 1
+#endif
+
 /* ENABLE macro defaults */
 

trunk/JavaScriptCore/wtf/Vector.h

@@ -261 +261 @@
         T* buffer() { return m_buffer; }
         const T* buffer() const { return m_buffer; }
+        T** bufferSlot() { return &m_buffer; }
         size_t capacity() const { return m_capacity; }
 
@@ -325 +326 @@
 
         using Base::buffer;
+        using Base::bufferSlot;
         using Base::capacity;
 
@@ -368 +370 @@
 
         using Base::buffer;
+        using Base::bufferSlot;
         using Base::capacity;
 
@@ -446 +449 @@
         T* data() { return m_buffer.buffer(); }
         const T* data() const { return m_buffer.buffer(); }
+        T** dataSlot() { return m_buffer.bufferSlot(); }
 
         iterator begin() { return data(); }

trunk/JavaScriptCore/wtf/VectorTraits.h

@@ -95 +95 @@
     struct VectorTraits<RefPtr<P> > : SimpleClassVectorTraits { };
     
+    template<typename P>
+    struct VectorTraits<std::auto_ptr<P> > : SimpleClassVectorTraits { };
+
     template<typename First, typename Second>
     struct VectorTraits<pair<First, Second> >