Changeset 69970 in webkit

Timestamp:

Oct 18, 2010 10:23:53 AM (14 years ago)

Author:

Darin Adler

Message:

2010-10-18 Darin Adler <Darin Adler>

Reviewed by Anders Carlsson.

Make a nullptr that works with OwnPtr and RefPtr
​https://bugs.webkit.org/show_bug.cgi?id=47756

• JavaScriptCore.xcodeproj/project.pbxproj: Added NullPtr.h.

• wtf/NullPtr.h: Added.

• wtf/OwnArrayPtr.h: Add an overload of = taking nullptr.
• wtf/OwnPtr.h: Ditto.
• wtf/PassOwnArrayPtr.h: Ditto.
• wtf/PassOwnPtr.h: Ditto.
• wtf/PassRefPtr.h: Ditto.
• wtf/RefPtr.h: Ditto.
• wtf/RetainPtr.h: Ditto.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• wtf/Noncopyable.h (modified) (1 diff)
• wtf/NullPtr.h (added)
• wtf/OwnArrayPtr.h (modified) (2 diffs)
• wtf/OwnPtr.h (modified) (2 diffs)
• wtf/PassOwnArrayPtr.h (modified) (2 diffs)
• wtf/PassOwnPtr.h (modified) (2 diffs)
• wtf/PassRefPtr.h (modified) (2 diffs)
• wtf/RefPtr.h (modified) (2 diffs)
• wtf/RetainPtr.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-10-18  Darin Adler  <darin@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Make a nullptr that works with OwnPtr and RefPtr
+        https://bugs.webkit.org/show_bug.cgi?id=47756
+
+        * JavaScriptCore.xcodeproj/project.pbxproj: Added NullPtr.h.
+
+        * wtf/NullPtr.h: Added.
+
+        * wtf/OwnArrayPtr.h: Add an overload of = taking nullptr.
+        * wtf/OwnPtr.h: Ditto.
+        * wtf/PassOwnArrayPtr.h: Ditto.
+        * wtf/PassOwnPtr.h: Ditto.
+        * wtf/PassRefPtr.h: Ditto.
+        * wtf/RefPtr.h: Ditto.
+        * wtf/RetainPtr.h: Ditto.
+
 2010-10-18  Oliver Hunt  <oliver@apple.com>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -278 +278 @@
                 933040040E6A749400786E6A /* SmallStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = 93303FEA0E6A72C000786E6A /* SmallStrings.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9330402C0E6A764000786E6A /* SmallStrings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93303FE80E6A72B500786E6A /* SmallStrings.cpp */; };
+                933F5CDC1269229B0049191E /* NullPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 933F5CDB126922690049191E /* NullPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 937013480CA97E0E00FA14D3 /* pcre_ucp_searchfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 937013470CA97E0E00FA14D3 /* pcre_ucp_searchfuncs.cpp */; settings = {COMPILER_FLAGS = "-Wno-sign-compare"; }; };
                 93E26BD408B1514100F85226 /* pcre_xclass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BD308B1514100F85226 /* pcre_xclass.cpp */; };
@@ -892 +893 @@
                 933A349A038AE7C6008635CE /* Identifier.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Identifier.h; sourceTree = "<group>"; tabWidth = 8; };
                 933A349D038AE80F008635CE /* Identifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Identifier.cpp; sourceTree = "<group>"; tabWidth = 8; };
+                933F5CDB126922690049191E /* NullPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NullPtr.h; sourceTree = "<group>"; };
                 935AF46909E9D9DB00ACD1D8 /* Forward.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Forward.h; sourceTree = "<group>"; };
                 935AF46B09E9D9DB00ACD1D8 /* UnusedParam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnusedParam.h; sourceTree = "<group>"; };
@@ -1518 +1520 @@
                                 9303F5690991190000AD71B8 /* Noncopyable.h */,
                                 C0A2723F0E509F1E00E96E15 /* NotFound.h */,
+                                933F5CDB126922690049191E /* NullPtr.h */,
                                 9303F5A409911A5800AD71B8 /* OwnArrayPtr.h */,
                                 BCFBE697122561D200309E9D /* OwnArrayPtrCommon.h */,
@@ -2343 +2346 @@
                                 90213E3E123A40C200D422F3 /* MemoryStatistics.h in Headers */,
                                 A730B6121250068F009D25B1 /* StrictEvalActivation.h in Headers */,
+                                933F5CDC1269229B0049191E /* NullPtr.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/JavaScriptCore/wtf/Noncopyable.h

@@ -1 +1 @@
 /*
- *  Copyright (C) 2006 Apple Computer, Inc.
+ *  Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or

trunk/JavaScriptCore/wtf/OwnArrayPtr.h

@@ -24 +24 @@
 #include "Assertions.h"
 #include "Noncopyable.h"
+#include "NullPtr.h"
 #include "OwnArrayPtrCommon.h"
 #include <algorithm>
@@ -74 +75 @@
 
     OwnArrayPtr& operator=(const PassOwnArrayPtr<T>&);
+    OwnArrayPtr& operator=(std::nullptr_t) { clear(); return *this; }
     template<typename U> OwnArrayPtr& operator=(const PassOwnArrayPtr<U>&);
 

trunk/JavaScriptCore/wtf/OwnPtr.h

@@ -24 +24 @@
 #include "Assertions.h"
 #include "Noncopyable.h"
+#include "NullPtr.h"
 #include "OwnPtrCommon.h"
 #include "TypeTraits.h"
@@ -73 +74 @@
 
         OwnPtr& operator=(const PassOwnPtr<T>&);
+        OwnPtr& operator=(std::nullptr_t) { clear(); return *this; }
         template<typename U> OwnPtr& operator=(const PassOwnPtr<U>&);
 

trunk/JavaScriptCore/wtf/PassOwnArrayPtr.h

@@ -28 +28 @@
 
 #include "Assertions.h"
+#include "NullPtr.h"
 #include "OwnArrayPtrCommon.h"
 #include "TypeTraits.h"
@@ -73 +74 @@
 
     PassOwnArrayPtr& operator=(const PassOwnArrayPtr<T>&);
+    PassOwnArrayPtr& operator=(std::nullptr_t) { clear(); return *this; }
     template<typename U> PassOwnArrayPtr& operator=(const PassOwnArrayPtr<U>&);
 

trunk/JavaScriptCore/wtf/PassOwnPtr.h

@@ -28 +28 @@
 
 #include "Assertions.h"
+#include "NullPtr.h"
 #include "OwnPtrCommon.h"
 #include "TypeTraits.h"
@@ -72 +73 @@
 
         PassOwnPtr& operator=(const PassOwnPtr<T>&);
+        PassOwnPtr& operator=(std::nullptr_t) { clear(); return *this; }
         template<typename U> PassOwnPtr& operator=(const PassOwnPtr<U>&);
 

trunk/JavaScriptCore/wtf/PassRefPtr.h

@@ -23 +23 @@
 
 #include "AlwaysInline.h"
+#include "NullPtr.h"
 
 namespace WTF {
@@ -91 +92 @@
         PassRefPtr& operator=(T*);
         PassRefPtr& operator=(const PassRefPtr&);
+        PassRefPtr& operator=(std::nullptr_t) { clear(); return *this; }
         template<typename U> PassRefPtr& operator=(const PassRefPtr<U>&);
         template<typename U> PassRefPtr& operator=(const RefPtr<U>&);

trunk/JavaScriptCore/wtf/RefPtr.h

@@ -25 +25 @@
 
 #include <algorithm>
-#include "AlwaysInline.h"
 #include "FastAllocBase.h"
 #include "PassRefPtr.h"
@@ -76 +75 @@
         RefPtr& operator=(const PassRefPtr<T>&);
         RefPtr& operator=(const NonNullPassRefPtr<T>&);
+        RefPtr& operator=(std::nullptr_t) { clear(); return *this; }
         template<typename U> RefPtr& operator=(const RefPtr<U>&);
         template<typename U> RefPtr& operator=(const PassRefPtr<U>&);

trunk/JavaScriptCore/wtf/RetainPtr.h

@@ -23 +23 @@
 
 #include "HashTraits.h"
+#include "NullPtr.h"
 #include "TypeTraits.h"
 #include <algorithm>
@@ -87 +88 @@
         RetainPtr& operator=(PtrType);
         template<typename U> RetainPtr& operator=(U*);
+        RetainPtr& operator=(std::nullptr_t) { clear(); return *this; }
 
         void adoptCF(PtrType);