Title: [170720] tags/Safari-538.44/Source/WTF
Revision
170720
Author
[email protected]
Date
2014-07-02 14:03:43 -0700 (Wed, 02 Jul 2014)

Log Message

Merged r170713.

Modified Paths

Diff

Modified: tags/Safari-538.44/Source/WTF/ChangeLog (170719 => 170720)


--- tags/Safari-538.44/Source/WTF/ChangeLog	2014-07-02 20:43:17 UTC (rev 170719)
+++ tags/Safari-538.44/Source/WTF/ChangeLog	2014-07-02 21:03:43 UTC (rev 170720)
@@ -1,3 +1,15 @@
+2014-07-02  Babak Shafiei  <[email protected]>
+
+        Merge r170713.
+
+    2014-07-02  Enrica Casucci  <[email protected]>
+
+            iOS build fix after http://trac.webkit.org/changeset/170697.
+        
+            Unreviewed.
+
+            * wtf/Deque.h:
+
 2014-07-01  Alex Christensen  <[email protected]>
 
         Reduce dynamic memory allocation in css jit.

Modified: tags/Safari-538.44/Source/WTF/wtf/Deque.h (170719 => 170720)


--- tags/Safari-538.44/Source/WTF/wtf/Deque.h	2014-07-02 20:43:17 UTC (rev 170719)
+++ tags/Safari-538.44/Source/WTF/wtf/Deque.h	2014-07-02 21:03:43 UTC (rev 170720)
@@ -113,7 +113,7 @@
 #endif
     };
 
-    template<typename T, size_t inlineCapacity>
+    template<typename T, size_t inlineCapacity = 0>
     class DequeIteratorBase {
     protected:
         DequeIteratorBase();
@@ -149,7 +149,7 @@
 #endif
     };
 
-    template<typename T, size_t inlineCapacity>
+    template<typename T, size_t inlineCapacity = 0>
     class DequeIterator : public DequeIteratorBase<T, inlineCapacity> {
     private:
         typedef DequeIteratorBase<T, inlineCapacity> Base;
@@ -180,7 +180,7 @@
         // postfix -- intentionally omitted
     };
 
-    template<typename T, size_t inlineCapacity>
+    template<typename T, size_t inlineCapacity = 0>
     class DequeConstIterator : public DequeIteratorBase<T, inlineCapacity> {
     private:
         typedef DequeIteratorBase<T, inlineCapacity> Base;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to