summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2011-01-20 06:29:02 +0000
committerAnders Carlsson <andersca@mac.com>2011-01-20 06:29:02 +0000
commitc87f861d0abfb992e347e20256b8f60959d2fc1d (patch)
tree37ece8ef24218c214258d67040b0f1e5ff4d01f8 /clang/lib
parent2cd1f0beb6f48fbca1261aaad3eeef597a719175 (diff)
downloadbcm5719-llvm-c87f861d0abfb992e347e20256b8f60959d2fc1d.tar.gz
bcm5719-llvm-c87f861d0abfb992e347e20256b8f60959d2fc1d.zip
Make CheckOverrideControl a member of Sema.
llvm-svn: 123893
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 8fe4852890d..9981b1f6c89 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -853,8 +853,7 @@ Decl *Sema::ActOnAccessSpecifier(AccessSpecifier Access,
}
/// CheckOverrideControl - Check C++0x override control semantics.
-static void
-CheckOverrideControl(Sema& SemaRef, const Decl *D) {
+void Sema::CheckOverrideControl(const Decl *D) {
const CXXMethodDecl *MD = llvm::dyn_cast<CXXMethodDecl>(D);
if (!MD || !MD->isVirtual())
return;
@@ -866,7 +865,7 @@ CheckOverrideControl(Sema& SemaRef, const Decl *D) {
bool HasOverriddenMethods =
MD->begin_overridden_methods() != MD->end_overridden_methods();
if (MD->isMarkedOverride() && !HasOverriddenMethods) {
- SemaRef.Diag(MD->getLocation(),
+ Diag(MD->getLocation(),
diag::err_function_marked_override_not_overriding)
<< MD->getDeclName();
return;
@@ -1029,7 +1028,7 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
MD->setIsMarkedFinal(true);
}
- CheckOverrideControl(*this, Member);
+ CheckOverrideControl(Member);
assert((Name || isInstField) && "No identifier for non-field ?");
OpenPOWER on IntegriCloud