Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: Source/wtf/PassOwnArrayPtr.h

Issue 23531003: Type check when upcasting PassOwnPtr/PassOwnArrayPtr to avoid possible function call ambiguousness (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 12 matching lines...) Expand all
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef WTF_PassOwnArrayPtr_h 26 #ifndef WTF_PassOwnArrayPtr_h
27 #define WTF_PassOwnArrayPtr_h 27 #define WTF_PassOwnArrayPtr_h
28 28
29 #include "wtf/Assertions.h" 29 #include "wtf/Assertions.h"
30 #include "wtf/NullPtr.h" 30 #include "wtf/NullPtr.h"
31 #include "wtf/TypeTraits.h" 31 #include "wtf/TypeTraits.h"
32 32
33 #define EnsureOwnArrayPtrConvertibleArgDefn \
34 typename EnableIf<IsPointerConvertible<U, T>::Value, bool>::Type
35 #define EnsureOwnArrayPtrConvertibleArgDecl \
36 EnsureOwnArrayPtrConvertibleArgDefn = true
37
33 namespace WTF { 38 namespace WTF {
34 39
35 template<typename T> class OwnArrayPtr; 40 template<typename T> class OwnArrayPtr;
36 template<typename T> class PassOwnArrayPtr; 41 template<typename T> class PassOwnArrayPtr;
37 template<typename T> PassOwnArrayPtr<T> adoptArrayPtr(T*); 42 template<typename T> PassOwnArrayPtr<T> adoptArrayPtr(T*);
38 template<typename T> void deleteOwnedArrayPtr(T* ptr); 43 template<typename T> void deleteOwnedArrayPtr(T* ptr);
39 44
40 template<typename T> class PassOwnArrayPtr { 45 template<typename T> class PassOwnArrayPtr {
41 WTF_DISALLOW_CONSTRUCTION_FROM_ZERO(PassOwnArrayPtr); 46 WTF_DISALLOW_CONSTRUCTION_FROM_ZERO(PassOwnArrayPtr);
42 public: 47 public:
43 typedef T* PtrType; 48 typedef T* PtrType;
44 49
45 PassOwnArrayPtr() : m_ptr(0) { } 50 PassOwnArrayPtr() : m_ptr(0) { }
46 PassOwnArrayPtr(std::nullptr_t) : m_ptr(0) { } 51 PassOwnArrayPtr(std::nullptr_t) : m_ptr(0) { }
47 52
48 // It somewhat breaks the type system to allow transfer of ownership out of 53 // It somewhat breaks the type system to allow transfer of ownership out of
49 // a const PassOwnArrayPtr. However, it makes it much easier to work with Pa ssOwnArrayPtr 54 // a const PassOwnArrayPtr. However, it makes it much easier to work with Pa ssOwnArrayPtr
50 // temporaries, and we don't have a need to use real const PassOwnArrayPtrs anyway. 55 // temporaries, and we don't have a need to use real const PassOwnArrayPtrs anyway.
51 PassOwnArrayPtr(const PassOwnArrayPtr& o) : m_ptr(o.leakPtr()) { } 56 PassOwnArrayPtr(const PassOwnArrayPtr& o) : m_ptr(o.leakPtr()) { }
52 template<typename U> PassOwnArrayPtr(const PassOwnArrayPtr<U>& o) : m_ptr(o. leakPtr()) { } 57 template<typename U> PassOwnArrayPtr(const PassOwnArrayPtr<U>& o, EnsureOwnA rrayPtrConvertibleArgDecl) : m_ptr(o.leakPtr()) { }
53 58
54 ~PassOwnArrayPtr() { deleteOwnedArrayPtr(m_ptr); } 59 ~PassOwnArrayPtr() { deleteOwnedArrayPtr(m_ptr); }
55 60
56 PtrType get() const { return m_ptr; } 61 PtrType get() const { return m_ptr; }
57 62
58 PtrType leakPtr() const WARN_UNUSED_RETURN; 63 PtrType leakPtr() const WARN_UNUSED_RETURN;
59 64
60 T& operator*() const { ASSERT(m_ptr); return *m_ptr; } 65 T& operator*() const { ASSERT(m_ptr); return *m_ptr; }
61 PtrType operator->() const { ASSERT(m_ptr); return m_ptr; } 66 PtrType operator->() const { ASSERT(m_ptr); return m_ptr; }
62 67
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 } 166 }
162 167
163 } // namespace WTF 168 } // namespace WTF
164 169
165 using WTF::PassOwnArrayPtr; 170 using WTF::PassOwnArrayPtr;
166 using WTF::adoptArrayPtr; 171 using WTF::adoptArrayPtr;
167 using WTF::const_pointer_cast; 172 using WTF::const_pointer_cast;
168 using WTF::static_pointer_cast; 173 using WTF::static_pointer_cast;
169 174
170 #endif // WTF_PassOwnArrayPtr_h 175 #endif // WTF_PassOwnArrayPtr_h
OLDNEW
« no previous file with comments | « Source/wtf/OwnPtrCommon.h ('k') | Source/wtf/PassOwnPtr.h » ('j') | Source/wtf/PassRefPtr.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698