diff options
| author | Sean Hunt <scshunt@csclub.uwaterloo.ca> | 2011-05-10 19:08:14 +0000 |
|---|---|---|
| committer | Sean Hunt <scshunt@csclub.uwaterloo.ca> | 2011-05-10 19:08:14 +0000 |
| commit | f961ea5716867b5e426fb2136edd6d1f04c3a7ca (patch) | |
| tree | 779d80571fb200593f8b1e124326963c2e5a8830 /lib/Sema/SemaAccess.cpp | |
| parent | ed63e03e35f2c8ad1a06d7bbc2249d132a730175 (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@131143 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaAccess.cpp')
| -rw-r--r-- | lib/Sema/SemaAccess.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index 63983c3daf..f340bb3fda 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/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; } |