diff options
| author | Alexis Hunt <alercah@gmail.com> | 2011-05-10 19:08:14 +0000 |
|---|---|---|
| committer | Alexis Hunt <alercah@gmail.com> | 2011-05-10 19:08:14 +0000 |
| commit | 80f00ff95d3b0710c01cce96358f05da348a4a52 (patch) | |
| tree | f94c7c727317aa3368688b467e36c17e6acc717d /clang/lib/Sema/SemaAccess.cpp | |
| parent | 07ceb0a1a4816be1b93377dcae4a5c38d1d924fd (diff) | |
| download | bcm5719-llvm-80f00ff95d3b0710c01cce96358f05da348a4a52.tar.gz bcm5719-llvm-80f00ff95d3b0710c01cce96358f05da348a4a52.zip | |
Re-do R131114 without breaking code.
I've edited one diagnostic which would print "copy constructor" for copy
constructors and "constructor" for any other constructor. If anyone is
extremely enamored with this, it can be reinstated with a simple boolean
flag rather than calling getSpecialMember, which is inappropriate.
llvm-svn: 131143
Diffstat (limited to 'clang/lib/Sema/SemaAccess.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaAccess.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaAccess.cpp b/clang/lib/Sema/SemaAccess.cpp index 63983c3daf9..f340bb3fda2 100644 --- a/clang/lib/Sema/SemaAccess.cpp +++ b/clang/lib/Sema/SemaAccess.cpp @@ -1423,17 +1423,15 @@ Sema::AccessResult Sema::CheckConstructorAccess(SourceLocation UseLoc, break; case InitializedEntity::EK_Base: - AccessEntity.setDiag(PDiag(diag::err_access_base) + AccessEntity.setDiag(PDiag(diag::err_access_base_ctor) << Entity.isInheritedVirtualBase() - << Entity.getBaseSpecifier()->getType() - << getSpecialMember(Constructor)); + << Entity.getBaseSpecifier()->getType()); break; case InitializedEntity::EK_Member: { const FieldDecl *Field = cast<FieldDecl>(Entity.getDecl()); - AccessEntity.setDiag(PDiag(diag::err_access_field) - << Field->getType() - << getSpecialMember(Constructor)); + AccessEntity.setDiag(PDiag(diag::err_access_field_ctor) + << Field->getType()); break; } |
