diff options
author | Douglas Gregor <dgregor@apple.com> | 2009-12-16 03:45:30 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2009-12-16 03:45:30 +0000 |
commit | 7c3bbdfd283046c0d1ed4e47af5255d2723453db (patch) | |
tree | 027d2ffb08c92ae4b32b4e72f34a5c81a532b169 /clang/lib/Sema/SemaDeclCXX.cpp | |
parent | 64a03454c6f9a37f410ede1ba7e0813c96e1add0 (diff) | |
download | bcm5719-llvm-7c3bbdfd283046c0d1ed4e47af5255d2723453db.tar.gz bcm5719-llvm-7c3bbdfd283046c0d1ed4e47af5255d2723453db.zip |
Fix semantic diagnostics that embed English works, from Nicola Gigante!
llvm-svn: 91503
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 08edb117e87..7eb1d9ed0aa 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -1139,7 +1139,7 @@ Sema::BuildMemberInitializer(FieldDecl *Member, Expr **Args, } else NewExp = (Expr*)Args[0]; - if (PerformCopyInitialization(NewExp, FieldType, "passing")) + if (PerformCopyInitialization(NewExp, FieldType, AA_Passing)) return true; Args[0] = NewExp; } @@ -4566,7 +4566,7 @@ Sema::CheckReferenceInit(Expr *&Init, QualType DeclType, (T1->isRecordType() || T2->isRecordType())) { if (!ICS) Diag(DeclLoc, diag::err_typecheck_convert_incompatible) - << DeclType << Init->getType() << "initializing" << Init->getSourceRange(); + << DeclType << Init->getType() << AA_Initializing << Init->getSourceRange(); return true; } @@ -4600,7 +4600,7 @@ Sema::CheckReferenceInit(Expr *&Init, QualType DeclType, return ICS->ConversionKind == ImplicitConversionSequence::BadConversion; } else { ImplicitConversionSequence Conversions; - bool badConversion = PerformImplicitConversion(Init, T1, "initializing", + bool badConversion = PerformImplicitConversion(Init, T1, AA_Initializing, false, false, Conversions); if (badConversion) { |