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

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

Issue 17959002: Disallow C++11 compilers from constructing OwnPtrs from 0 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add a macro to disallow construction from zero Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/wtf/OwnPtr.h ('k') | Source/wtf/PassOwnPtr.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 20 matching lines...) Expand all
31 #include "wtf/TypeTraits.h" 31 #include "wtf/TypeTraits.h"
32 32
33 namespace WTF { 33 namespace WTF {
34 34
35 template<typename T> class OwnArrayPtr; 35 template<typename T> class OwnArrayPtr;
36 template<typename T> class PassOwnArrayPtr; 36 template<typename T> class PassOwnArrayPtr;
37 template<typename T> PassOwnArrayPtr<T> adoptArrayPtr(T*); 37 template<typename T> PassOwnArrayPtr<T> adoptArrayPtr(T*);
38 template<typename T> void deleteOwnedArrayPtr(T* ptr); 38 template<typename T> void deleteOwnedArrayPtr(T* ptr);
39 39
40 template<typename T> class PassOwnArrayPtr { 40 template<typename T> class PassOwnArrayPtr {
41 WTF_DISALLOW_CONSTRUCTION_FROM_ZERO(PassOwnArrayPtr);
41 public: 42 public:
42 typedef T* PtrType; 43 typedef T* PtrType;
43 44
44 PassOwnArrayPtr() : m_ptr(0) { } 45 PassOwnArrayPtr() : m_ptr(0) { }
45 PassOwnArrayPtr(std::nullptr_t) : m_ptr(0) { } 46 PassOwnArrayPtr(std::nullptr_t) : m_ptr(0) { }
46 47
47 // It somewhat breaks the type system to allow transfer of ownership out of 48 // It somewhat breaks the type system to allow transfer of ownership out of
48 // a const PassOwnArrayPtr. However, it makes it much easier to work with Pa ssOwnArrayPtr 49 // a const PassOwnArrayPtr. However, it makes it much easier to work with Pa ssOwnArrayPtr
49 // temporaries, and we don't have a need to use real const PassOwnArrayPtrs anyway. 50 // temporaries, and we don't have a need to use real const PassOwnArrayPtrs anyway.
50 PassOwnArrayPtr(const PassOwnArrayPtr& o) : m_ptr(o.leakPtr()) { } 51 PassOwnArrayPtr(const PassOwnArrayPtr& o) : m_ptr(o.leakPtr()) { }
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 } 161 }
161 162
162 } // namespace WTF 163 } // namespace WTF
163 164
164 using WTF::PassOwnArrayPtr; 165 using WTF::PassOwnArrayPtr;
165 using WTF::adoptArrayPtr; 166 using WTF::adoptArrayPtr;
166 using WTF::const_pointer_cast; 167 using WTF::const_pointer_cast;
167 using WTF::static_pointer_cast; 168 using WTF::static_pointer_cast;
168 169
169 #endif // WTF_PassOwnArrayPtr_h 170 #endif // WTF_PassOwnArrayPtr_h
OLDNEW
« no previous file with comments | « Source/wtf/OwnPtr.h ('k') | Source/wtf/PassOwnPtr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698