diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-04-22 05:40:53 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-04-22 05:40:53 +0000 |
| commit | 05bf00938bef071f41a4f0fe4879b1041038dbaf (patch) | |
| tree | f18ea2c4bd89602c06d92fde9bfe46f97ef0ffd1 /clang/lib/Sema/SemaDeclCXX.cpp | |
| parent | 131378bd2514cba822942098112da09c04d95a80 (diff) | |
| download | bcm5719-llvm-05bf00938bef071f41a4f0fe4879b1041038dbaf.tar.gz bcm5719-llvm-05bf00938bef071f41a4f0fe4879b1041038dbaf.zip | |
Re-land the patch that merges two diagnostics into one now that it passes self-host :)
llvm-svn: 102050
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 7ee7874c2cb..afbfa534e93 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -3912,7 +3912,7 @@ void Sema::DefineImplicitDefaultConstructor(SourceLocation CurrentLocation, CurContext = Constructor; if (SetBaseOrMemberInitializers(Constructor, 0, 0, /*AnyErrors=*/false)) { Diag(CurrentLocation, diag::note_member_synthesized_at) - << CXXDefaultConstructor << Context.getTagDeclType(ClassDecl); + << CXXConstructor << Context.getTagDeclType(ClassDecl); Constructor->setInvalidDecl(); } else { Constructor->setUsed(); |
