aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2011-01-20 06:33:26 +0000
committerAnders Carlsson <andersca@mac.com>2011-01-20 06:33:26 +0000
commit3ffe183448af7c543a208dd3313a49c83a3ad53e (patch)
treea665657019ad6f7a2e48d238e8783bb1ee7fb729 /lib
parent4ebf1605166e0b6cc967a51429949a0722f79665 (diff)
When checking for functions marked override, ignore dependent contexts.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@123894 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Sema/SemaDeclCXX.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 9981b1f6c8..b9d760b412 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -858,6 +858,9 @@ void Sema::CheckOverrideControl(const Decl *D) {
if (!MD || !MD->isVirtual())
return;
+ if (MD->isDependentContext())
+ return;
+
// C++0x [class.virtual]p3:
// If a virtual function is marked with the virt-specifier override and does
// not override a member function of a base class,