diff options
| author | dim <dim@FreeBSD.org> | 2015-09-06 18:36:24 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-06 18:36:24 +0000 |
| commit | 4238dc458ed9a048965af111b979fd51d288f22c (patch) | |
| tree | 3d3ed1e1987dbe6444294b1b4e249814b97b97a5 /lib/Sema/SemaExprCXX.cpp | |
| parent | 6416b56f5a3923c6c264b46365e16718ccabf081 (diff) | |
| download | FreeBSD-src-4238dc458ed9a048965af111b979fd51d288f22c.zip FreeBSD-src-4238dc458ed9a048965af111b979fd51d288f22c.tar.gz | |
Import clang 3.7.0 release (r246257).
Diffstat (limited to 'lib/Sema/SemaExprCXX.cpp')
| -rw-r--r-- | lib/Sema/SemaExprCXX.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index 6608d7c..01966d5 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -4950,7 +4950,9 @@ QualType Sema::CXXCheckConditionalOperands(ExprResult &Cond, ExprResult &LHS, // Extension: conditional operator involving vector types. if (LTy->isVectorType() || RTy->isVectorType()) - return CheckVectorOperands(LHS, RHS, QuestionLoc, /*isCompAssign*/false); + return CheckVectorOperands(LHS, RHS, QuestionLoc, /*isCompAssign*/false, + /*AllowBothBool*/true, + /*AllowBoolConversions*/false); // -- The second and third operands have arithmetic or enumeration type; // the usual arithmetic conversions are performed to bring them to a |
