diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-04-22 01:17:32 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-04-22 01:17:32 +0000 |
| commit | 046bb5cc3fb17d41def0fba7e3e84722b8053d2b (patch) | |
| tree | 911b5742d9a3bcdf2e9831d8f1ef6e2c508ab09c /clang/lib/Sema/SemaAccess.cpp | |
| parent | 2e6567ae605c6b070ace32e8ecc19a36127b04f7 (diff) | |
| download | bcm5719-llvm-046bb5cc3fb17d41def0fba7e3e84722b8053d2b.tar.gz bcm5719-llvm-046bb5cc3fb17d41def0fba7e3e84722b8053d2b.zip | |
Unify two diagnostics into one.
llvm-svn: 102040
Diffstat (limited to 'clang/lib/Sema/SemaAccess.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaAccess.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/clang/lib/Sema/SemaAccess.cpp b/clang/lib/Sema/SemaAccess.cpp index f71d36ad7f3..af0c5b526ce 100644 --- a/clang/lib/Sema/SemaAccess.cpp +++ b/clang/lib/Sema/SemaAccess.cpp @@ -1143,14 +1143,13 @@ Sema::AccessResult Sema::CheckConstructorAccess(SourceLocation UseLoc, AccessEntity.setDiag(diag::err_access_ctor); break; - case InitializedEntity::EK_Base: { - unsigned DiagID = Entity.isInheritedVirtualBase() ? - diag::err_access_ctor_vbase : diag::err_access_ctor_base; - AccessEntity.setDiag(PDiag(DiagID) - << Entity.getBaseSpecifier()->getType()); + case InitializedEntity::EK_Base: + AccessEntity.setDiag(PDiag(diag::err_access_base) + << Entity.isInheritedVirtualBase() + << Entity.getBaseSpecifier()->getType() + << getSpecialMember(Constructor)); break; - } - + case InitializedEntity::EK_Member: { const FieldDecl *Field = cast<FieldDecl>(Entity.getDecl()); AccessEntity.setDiag(PDiag(diag::err_access_ctor_field) |
