Title: [102459] trunk/Source/_javascript_Core
Revision
102459
Author
[email protected]
Date
2011-12-09 10:59:21 -0800 (Fri, 09 Dec 2011)

Log Message

Fix HashMap<..., OwnPtr<...> >::add compilation errors
https://bugs.webkit.org/show_bug.cgi?id=74159

Reviewed by Darin Adler.

Add a constructor to OwnPtr that takes the empty value (nullptr_t)
from HashTraits so that this function can compile.

* wtf/OwnPtr.h:
(WTF::OwnPtr::OwnPtr):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (102458 => 102459)


--- trunk/Source/_javascript_Core/ChangeLog	2011-12-09 17:52:23 UTC (rev 102458)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-12-09 18:59:21 UTC (rev 102459)
@@ -1,3 +1,16 @@
+2011-12-09  Adrienne Walker  <[email protected]>
+
+        Fix HashMap<..., OwnPtr<...> >::add compilation errors
+        https://bugs.webkit.org/show_bug.cgi?id=74159
+
+        Reviewed by Darin Adler.
+
+        Add a constructor to OwnPtr that takes the empty value (nullptr_t)
+        from HashTraits so that this function can compile.
+
+        * wtf/OwnPtr.h:
+        (WTF::OwnPtr::OwnPtr):
+
 2011-12-09  Oliver Hunt  <[email protected]>
 
         Avoid reloading storage pointer for indexed properties unnecessarily

Modified: trunk/Source/_javascript_Core/wtf/OwnPtr.h (102458 => 102459)


--- trunk/Source/_javascript_Core/wtf/OwnPtr.h	2011-12-09 17:52:23 UTC (rev 102458)
+++ trunk/Source/_javascript_Core/wtf/OwnPtr.h	2011-12-09 18:59:21 UTC (rev 102459)
@@ -41,6 +41,7 @@
         typedef ValueType* PtrType;
 
         OwnPtr() : m_ptr(0) { }
+        OwnPtr(std::nullptr_t) : m_ptr(0) { }
 
         // See comment in PassOwnPtr.h for why this takes a const reference.
         template<typename U> OwnPtr(const PassOwnPtr<U>& o);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to