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 | 792898b58a27ea9034dd95710d388ed30cc693af (patch) | |
| tree | 8d6436036cfc2c5df394a858bbd0f2c4d69ca4e7 /lib/Sema/SemaDecl.cpp | |
| parent | ac418162692a951ca3796d6830496a85a2d12493 (diff) | |
Unify two diagnostics into one.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@102040 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index dc59fa4fbf..35a4710fc9 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -924,8 +924,7 @@ struct GNUCompatibleParamWarning { /// getSpecialMember - get the special member enum for a method. -static Sema::CXXSpecialMember getSpecialMember(ASTContext &Ctx, - const CXXMethodDecl *MD) { +Sema::CXXSpecialMember Sema::getSpecialMember(const CXXMethodDecl *MD) { if (const CXXConstructorDecl *Ctor = dyn_cast<CXXConstructorDecl>(MD)) { if (Ctor->isDefaultConstructor()) return Sema::CXXDefaultConstructor; @@ -1112,7 +1111,7 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, Decl *OldD) { } else { Diag(NewMethod->getLocation(), diag::err_definition_of_implicitly_declared_member) - << New << getSpecialMember(Context, OldMethod); + << New << getSpecialMember(OldMethod); return true; } } |