diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2009-11-06 00:55:14 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2009-11-06 00:55:14 +0000 |
| commit | 4c0cea2d9e933195f3af4aaf7bb5c65de80bdefc (patch) | |
| tree | 384bf60c089dc077626ab478ef3319f91294c3df /lib/Sema | |
| parent | 2c791bd122285e1212094147454ef996dee8ebaf (diff) | |
Minor cleanup of my last patch.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@86209 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/SemaExprCXX.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index 3408ff7087..c4fd39be6c 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -1096,7 +1096,7 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType, else assert(0 && "Unknown conversion function kind!"); // Whatch out for elipsis conversion. - if (!BeforeToType.isNull()) { + if (!ICS.UserDefined.EllipsisConversion) { if (PerformImplicitConversion(From, BeforeToType, ICS.UserDefined.Before, "converting")) return true; |