summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2013-11-08 01:20:25 +0000
committerDouglas Gregor <dgregor@apple.com>2013-11-08 01:20:25 +0000
commit2ee1d99d00d7182c5c2f566ff8cd93fc82b7eb2a (patch)
tree0bd5e716738999b86a74bff39233745590dcf4fa
parent51327f9237259a2469af7436faf259ba9d39cb4a (diff)
downloadbcm5719-llvm-2ee1d99d00d7182c5c2f566ff8cd93fc82b7eb2a.tar.gz
bcm5719-llvm-2ee1d99d00d7182c5c2f566ff8cd93fc82b7eb2a.zip
Fix a bogus assert I introduced in r194224
llvm-svn: 194237
-rw-r--r--clang/lib/Sema/SemaOverload.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index bc9a57cd8ec..acfa8a3ac74 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -3006,7 +3006,7 @@ IsUserDefinedConversion(Sema &S, Expr *From, QualType ToType,
OverloadCandidateSet &CandidateSet,
bool AllowExplicit,
bool AllowObjCConversionOnExplicit) {
- assert(!AllowExplicit || !AllowObjCConversionOnExplicit);
+ assert(AllowExplicit || !AllowObjCConversionOnExplicit);
// Whether we will only visit constructors.
bool ConstructorsOnly = false;
OpenPOWER on IntegriCloud