Title: [156505] trunk/Source
Revision
156505
Author
[email protected]
Date
2013-09-26 15:25:40 -0700 (Thu, 26 Sep 2013)

Log Message

Source/_javascript_Core: Work around another MSVC bug.

* runtime/PrototypeMap.cpp:
(JSC::PrototypeMap::emptyObjectStructureForPrototype):

Source/WTF: Build fixes.

Fix a paste-o.

* wtf/StdLibExtras.h:
(std::make_unique):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (156504 => 156505)


--- trunk/Source/_javascript_Core/ChangeLog	2013-09-26 22:20:46 UTC (rev 156504)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-09-26 22:25:40 UTC (rev 156505)
@@ -1,5 +1,12 @@
 2013-09-26  Anders Carlsson  <[email protected]>
 
+        Work around another MSVC bug.
+
+        * runtime/PrototypeMap.cpp:
+        (JSC::PrototypeMap::emptyObjectStructureForPrototype):
+
+2013-09-26  Anders Carlsson  <[email protected]>
+
         Attempt to fix the FTL build.
 
         * ftl/FTLAbstractHeap.cpp:

Modified: trunk/Source/_javascript_Core/runtime/PrototypeMap.cpp (156504 => 156505)


--- trunk/Source/_javascript_Core/runtime/PrototypeMap.cpp	2013-09-26 22:20:46 UTC (rev 156504)
+++ trunk/Source/_javascript_Core/runtime/PrototypeMap.cpp	2013-09-26 22:25:40 UTC (rev 156505)
@@ -63,7 +63,7 @@
     addPrototype(prototype);
     Structure* structure = JSFinalObject::createStructure(
         prototype->globalObject()->vm(), prototype->globalObject(), prototype, inlineCapacity);
-    addResult.iterator->value = structure;
+    addResult.iterator->value = Weak<Structure>(structure);
     return structure;
 }
 

Modified: trunk/Source/WTF/ChangeLog (156504 => 156505)


--- trunk/Source/WTF/ChangeLog	2013-09-26 22:20:46 UTC (rev 156504)
+++ trunk/Source/WTF/ChangeLog	2013-09-26 22:25:40 UTC (rev 156505)
@@ -1,5 +1,14 @@
 2013-09-26  Anders Carlsson  <[email protected]>
 
+        Build fixes.
+
+        Fix a paste-o.
+
+        * wtf/StdLibExtras.h:
+        (std::make_unique):
+
+2013-09-26  Anders Carlsson  <[email protected]>
+
         Remove the hash table mover
         https://bugs.webkit.org/show_bug.cgi?id=121980
 

Modified: trunk/Source/WTF/wtf/StdLibExtras.h (156504 => 156505)


--- trunk/Source/WTF/wtf/StdLibExtras.h	2013-09-26 22:20:46 UTC (rev 156504)
+++ trunk/Source/WTF/wtf/StdLibExtras.h	2013-09-26 22:25:40 UTC (rev 156505)
@@ -340,31 +340,31 @@
     }
 
     template<class T, class A1, class A2> typename _Unique_if<T>::_Single_object
-    make_unique(A1&& a1, A1&& a2)
+    make_unique(A1&& a1, A2&& a2)
     {
         return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2)));
     }
 
     template<class T, class A1, class A2, class A3> typename _Unique_if<T>::_Single_object
-    make_unique(A1&& a1, A1&& a2, A3&& a3)
+    make_unique(A1&& a1, A2&& a2, A3&& a3)
     {
         return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3)));
     }
 
     template<class T, class A1, class A2, class A3, class A4> typename _Unique_if<T>::_Single_object
-    make_unique(A1&& a1, A1&& a2, A3&& a3, A4&& a4)
+    make_unique(A1&& a1, A2&& a2, A3&& a3, A4&& a4)
     {
         return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4)));
     }
 
     template<class T, class A1, class A2, class A3, class A4, class A5> typename _Unique_if<T>::_Single_object
-    make_unique(A1&& a1, A1&& a2, A3&& a3, A4&& a4, A5&& a5)
+    make_unique(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5)
     {
         return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5)));
     }
 
     template<class T, class A1, class A2, class A3, class A4, class A5, class A6> typename _Unique_if<T>::_Single_object
-    make_unique(A1&& a1, A1&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6)
+    make_unique(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6)
     {
         return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6)));
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to