Changeset 40399 in webkit for trunk/JavaScriptCore/wtf/RetainPtr.h

Timestamp:

Jan 30, 2009, 12:34:14 AM (16 years ago)

Author:

[email protected]

Message:

2009-01-30 David Levin <​[email protected]>

Reviewed by Alexey Proskuryakov.

Bug 23616: Various "template helpers" should be consolidated from isolated files in JavaScriptCore.
<​https://bugs.webkit.org/show_bug.cgi?id=23616>

• wtf/TypeTraits.h: Moved RemovePointer, IsPod, IsInteger to this file.

• wtf/OwnPtr.h: Use RemovePointer from TypeTraits.h.
• wtf/RetainPtr.h: Ditto.

• wtf/HashTraits.h: Use IsInteger from TypeTraits.h.

• wtf/VectorTraits.h: Use IsPod from TypeTraits.h.

• GNUmakefile.am:
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj: Added TypeTraits.h.

File:

• trunk/JavaScriptCore/wtf/RetainPtr.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/RetainPtr.h

@@ -22 +22 @@
 #define RetainPtr_h
 
+#include "TypeTraits.h"
 #include <algorithm>
 #include <CoreFoundation/CoreFoundation.h>
@@ -30 +31 @@
 
 namespace WTF {
-
-    template <typename T> struct RemovePointer {
-        typedef T type;
-    };
-
-    template <typename T> struct RemovePointer<T*> {
-        typedef T type;
-    };
 
     // Unlike most most of our smart pointers, RetainPtr can take either the pointer type or the pointed-to type,
@@ -57 +50 @@
     template <typename T> class RetainPtr {
     public:
-        typedef typename RemovePointer<T>::type ValueType;
+        typedef typename RemovePointer<T>::Type ValueType;
         typedef ValueType* PtrType;