summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaInit.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2013-07-11 19:13:34 +0000
committerFariborz Jahanian <fjahanian@apple.com>2013-07-11 19:13:34 +0000
commit14e9541916556673d1731c34f938af84716d4d44 (patch)
tree55636621c4f6aa6bc3f031dbf60efbb69f280ab7 /clang/lib/Sema/SemaInit.cpp
parent621ca94358782802ec8041041b8edb5ba0e0cdb9 (diff)
downloadbcm5719-llvm-14e9541916556673d1731c34f938af84716d4d44.tar.gz
bcm5719-llvm-14e9541916556673d1731c34f938af84716d4d44.zip
Restore warning to its original text when
certain familiy of methods have the wrong type. // rdar://14408244 llvm-svn: 186111
Diffstat (limited to 'clang/lib/Sema/SemaInit.cpp')
-rw-r--r--clang/lib/Sema/SemaInit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 1898a159306..cc0829ef67b 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -4636,10 +4636,10 @@ getAssignmentAction(const InitializedEntity &Entity) {
return Sema::AA_Passing;
case InitializedEntity::EK_Result:
- case InitializedEntity::EK_RelatedResult:
return Sema::AA_Returning;
case InitializedEntity::EK_Temporary:
+ case InitializedEntity::EK_RelatedResult:
// FIXME: Can we tell apart casting vs. converting?
return Sema::AA_Casting;
OpenPOWER on IntegriCloud