summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaOverload.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-06-11 10:04:22 +0000
committerJohn McCall <rjmccall@apple.com>2010-06-11 10:04:22 +0000
commit6d1116ac4967bfc794bdf5dc3b782678726a0fd2 (patch)
tree50164b12a659cc365706b059a0edd035ca4ec619 /clang/lib/Sema/SemaOverload.cpp
parent5d474d0a96f4ffe6df571f2c6f36d68aa98cd2d2 (diff)
downloadbcm5719-llvm-6d1116ac4967bfc794bdf5dc3b782678726a0fd2.tar.gz
bcm5719-llvm-6d1116ac4967bfc794bdf5dc3b782678726a0fd2.zip
Conversions from Objective C object pointers to bool are "pointer conversions
to bool" in the sense of C++ [over.ics.rank]p4 bullet 1. I have decreed it. llvm-svn: 105817
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
-rw-r--r--clang/lib/Sema/SemaOverload.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index d3e8243f94f..89eb90bc13d 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -155,7 +155,9 @@ bool StandardConversionSequence::isPointerConversionToBool() const {
// check for their presence as well as checking whether FromType is
// a pointer.
if (getToType(1)->isBooleanType() &&
- (getFromType()->isPointerType() || getFromType()->isBlockPointerType() ||
+ (getFromType()->isPointerType() ||
+ getFromType()->isObjCObjectPointerType() ||
+ getFromType()->isBlockPointerType() ||
First == ICK_Array_To_Pointer || First == ICK_Function_To_Pointer))
return true;
OpenPOWER on IntegriCloud