| Index: Source/wtf/OwnArrayPtr.h
|
| diff --git a/Source/wtf/OwnArrayPtr.h b/Source/wtf/OwnArrayPtr.h
|
| index c039fbe82f943a87fb7127e62ea2e9b0d3ce4e0b..0d501ca16df7168aea2618a21c79089c539f6b57 100644
|
| --- a/Source/wtf/OwnArrayPtr.h
|
| +++ b/Source/wtf/OwnArrayPtr.h
|
| @@ -39,7 +39,7 @@ public:
|
| OwnArrayPtr() : m_ptr(0) { }
|
|
|
| // See comment in PassOwnArrayPtr.h for why this takes a const reference.
|
| - template<typename U> OwnArrayPtr(const PassOwnArrayPtr<U>& o);
|
| + template<typename U> OwnArrayPtr(const PassOwnArrayPtr<U>&, EnsureOwnArrayPtrConvertibleArgDecl);
|
|
|
| // This copy constructor is used implicitly by gcc when it generates
|
| // transients for assigning a PassOwnArrayPtr<T> object to a stack-allocated
|
| @@ -76,7 +76,7 @@ private:
|
| PtrType m_ptr;
|
| };
|
|
|
| -template<typename T> template<typename U> inline OwnArrayPtr<T>::OwnArrayPtr(const PassOwnArrayPtr<U>& o)
|
| +template<typename T> template<typename U> inline OwnArrayPtr<T>::OwnArrayPtr(const PassOwnArrayPtr<U>& o, EnsureOwnArrayPtrConvertibleArgDefn)
|
| : m_ptr(o.leakPtr())
|
| {
|
| }
|
|
|