summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaOverload.cpp
diff options
context:
space:
mode:
authorLarisse Voufo <lvoufo@google.com>2013-06-27 03:36:30 +0000
committerLarisse Voufo <lvoufo@google.com>2013-06-27 03:36:30 +0000
commit70bb43a11579615ec3707f293018efc94841d552 (patch)
treede90bd236722c162b5c2ba659f851eea7b61242b /clang/lib/Sema/SemaOverload.cpp
parent85fc876106c98ee025507269911c9723fce53de9 (diff)
downloadbcm5719-llvm-70bb43a11579615ec3707f293018efc94841d552.tar.gz
bcm5719-llvm-70bb43a11579615ec3707f293018efc94841d552.zip
A bit of program simplification from r185056
llvm-svn: 185058
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
-rw-r--r--clang/lib/Sema/SemaOverload.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index b1fe76a8f61..3f7ab1c90f1 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -3232,8 +3232,7 @@ Sema::DiagnoseMultipleUserDefinedConversion(Expr *From, QualType ToType) {
diag::err_typecheck_ambiguous_condition)
<< From->getType() << ToType << From->getSourceRange();
else if (OvResult == OR_No_Viable_Function && !CandidateSet.empty()) {
- if (!ToType->isIncompleteType() ||
- !RequireCompleteType(From->getLocStart(), ToType,
+ if (!RequireCompleteType(From->getLocStart(), ToType,
diag::err_typecheck_nonviable_condition_incomplete,
From->getType(), From->getSourceRange()))
Diag(From->getLocStart(),
OpenPOWER on IntegriCloud