diff options
author | Anders Carlsson <andersca@mac.com> | 2010-11-05 00:12:09 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@mac.com> | 2010-11-05 00:12:09 +0000 |
commit | c8df0b634ee5ca8573852fdc96252b8bba5a10db (patch) | |
tree | d1651bf74023c117029c3d0c5a8fe160f367e941 /lib/Sema/SemaOverload.cpp | |
parent | 84294911b83003bcac726d00ffa91143752feb57 (diff) |
Implement [over.ics.rank]p4: A conversion that does not convert an std::nullptr_t to bool is better than one than does.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@118269 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaOverload.cpp')
-rw-r--r-- | lib/Sema/SemaOverload.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index af00464859..af0456bf36 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -190,6 +190,7 @@ bool StandardConversionSequence::isPointerConversionToBool() const { (getFromType()->isPointerType() || getFromType()->isObjCObjectPointerType() || getFromType()->isBlockPointerType() || + getFromType()->isNullPtrType() || First == ICK_Array_To_Pointer || First == ICK_Function_To_Pointer)) return true; |