diff options
| author | Matt Beaumont-Gay <matthewbg@google.com> | 2011-05-19 23:44:42 +0000 |
|---|---|---|
| committer | Matt Beaumont-Gay <matthewbg@google.com> | 2011-05-19 23:44:42 +0000 |
| commit | 1e55e91a257c4ddd4364656b048a3c345c366804 (patch) | |
| tree | 05ccb3c72d7bf002d0f789a95184028a2912c0ce /lib/Sema/SemaAccess.cpp | |
| parent | c46d6410947b18ac4c52cff4d0f8021b10a57c1e (diff) | |
Undo enough of r131143 to make private copy ctor diags say "copy constructor" again
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@131706 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaAccess.cpp')
| -rw-r--r-- | lib/Sema/SemaAccess.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index 80995eb66f..e92d19d13d 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/lib/Sema/SemaAccess.cpp @@ -1425,13 +1425,17 @@ Sema::AccessResult Sema::CheckConstructorAccess(SourceLocation UseLoc, case InitializedEntity::EK_Base: AccessEntity.setDiag(PDiag(diag::err_access_base_ctor) << Entity.isInheritedVirtualBase() - << Entity.getBaseSpecifier()->getType()); + << Entity.getBaseSpecifier()->getType() + << (getSpecialMember(Constructor) == + Sema::CXXCopyConstructor)); break; case InitializedEntity::EK_Member: { const FieldDecl *Field = cast<FieldDecl>(Entity.getDecl()); AccessEntity.setDiag(PDiag(diag::err_access_field_ctor) - << Field->getType()); + << Field->getType() + << (getSpecialMember(Constructor) == + Sema::CXXCopyConstructor)); break; } |