summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2011-06-11 04:42:12 +0000
committerDouglas Gregor <dgregor@apple.com>2011-06-11 04:42:12 +0000
commit2720dc656bca9f9a4b1c115e85481af5c07536e3 (patch)
tree225097c5ead1aecc58b6a22a7ef857961a29fcc0 /clang/lib/Sema
parent79044dbebfa6d508e4a15ba9de52e24a014db0af (diff)
downloadbcm5719-llvm-2720dc656bca9f9a4b1c115e85481af5c07536e3.tar.gz
bcm5719-llvm-2720dc656bca9f9a4b1c115e85481af5c07536e3.zip
Fix order of operands for the warning about incompatible Objective-C
pointer assignment in C++. This was a longstanding problem spotted by Jordy Rose. llvm-svn: 132873
Diffstat (limited to 'clang/lib/Sema')
-rw-r--r--clang/lib/Sema/SemaExprCXX.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 27659f65077..50462abd3a4 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -2211,7 +2211,7 @@ Sema::PerformImplicitConversion(Expr *From, QualType ToType,
case ICK_Pointer_Conversion: {
if (SCS.IncompatibleObjC && Action != AA_Casting) {
// Diagnose incompatible Objective-C conversions
- if (Action == AA_Initializing)
+ if (Action == AA_Initializing || Action == AA_Assigning)
Diag(From->getSourceRange().getBegin(),
diag::ext_typecheck_convert_incompatible_pointer)
<< ToType << From->getType() << Action
OpenPOWER on IntegriCloud