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 | eec642f8aba6050ebf30a4b4050821e3e152808c (patch) | |
| tree | 887e489dcb9cbed4e4357e9f3c0ff5d0489393bd /clang/lib/Sema | |
| parent | 2980b975eeb8a37d8ca597938819bd47a92f3108 (diff) | |
| download | bcm5719-llvm-eec642f8aba6050ebf30a4b4050821e3e152808c.tar.gz bcm5719-llvm-eec642f8aba6050ebf30a4b4050821e3e152808c.zip | |
Minor cleanup of my last patch.
llvm-svn: 86209
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 3408ff7087f..c4fd39be6c2 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/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; |
