Source/wtf/OwnPtr.h - Issue 23531003: Type check when upcasting PassOwnPtr/PassOwnArrayPtr to avoid possible function call ambiguousness

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/wtf/OwnPtr.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: No new macros introduced. Only ones from TypeTraits.h are used. 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 side-by-side diff with in-line comments

Download patch

Index: Source/wtf/OwnPtr.h

diff --git a/Source/wtf/OwnPtr.h b/Source/wtf/OwnPtr.h

index 3c524890e0bba0c7e3fdf2cc760856acacf2c688..be972fff721dccd6eb1e8dce66a0a235e1d34c3e 100644

--- a/Source/wtf/OwnPtr.h

+++ b/Source/wtf/OwnPtr.h

@@ -50,7 +50,7 @@ namespace WTF {

OwnPtr(std::nullptr_t) : m_ptr(0) { }

// See comment in PassOwnPtr.h for why this takes a const reference.

- template<typename U> OwnPtr(const PassOwnPtr& o);

+ template<typename U> OwnPtr(const PassOwnPtr&, EnsurePtrConvertibleArgDecl(typename RemovePointer::Type, ValueType));

#if !COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)

// This copy constructor is used implicitly by gcc when it generates

@@ -111,7 +111,7 @@ namespace WTF {

PtrType m_ptr;

};

- template<typename T> template<typename U> inline OwnPtr<T>::OwnPtr(const PassOwnPtr& o)

+ template<typename T> template<typename U> inline OwnPtr<T>::OwnPtr(const PassOwnPtr& o, EnsurePtrConvertibleArgDefn(typename RemovePointer::Type, ValueType))

: m_ptr(o.leakPtr())

{

}

« no previous file with comments | « Source/wtf/OwnArrayPtr.h ('k') | Source/wtf/PassOwnArrayPtr.h » ('j') | no next file with comments »