aboutsummaryrefslogtreecommitdiff
path: root/include/clang/AST/DeclCXX.h
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2012-09-25 07:32:39 +0000
committerJohn McCall <rjmccall@apple.com>2012-09-25 07:32:39 +0000
commite402e72273cde2a64fa6097c1fe93f500038675d (patch)
tree06462d2691ea6e840a20fb9209ee1711b723a529 /include/clang/AST/DeclCXX.h
parent9f357de8d5823f9b13cf33ad1f6af1dd69b7669f (diff)
Fix for r163013 regression and further __interface enhancement.
Patch by Andy Gibbs! git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164590 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/AST/DeclCXX.h')
-rw-r--r--include/clang/AST/DeclCXX.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h
index 76be4086c9..26f91dd42d 100644
--- a/include/clang/AST/DeclCXX.h
+++ b/include/clang/AST/DeclCXX.h
@@ -1565,9 +1565,9 @@ public:
CXXMethodDecl *CD =
cast<CXXMethodDecl>(const_cast<CXXMethodDecl*>(this)->getCanonicalDecl());
- // Methods declared in interfaces are automatically (pure) virtual
+ // Methods declared in interfaces are automatically (pure) virtual.
if (CD->isVirtualAsWritten() ||
- CD->getParent()->getTagKind() == TTK_Interface)
+ (CD->getParent()->isInterface() && CD->isUserProvided()))
return true;
return (CD->begin_overridden_methods() != CD->end_overridden_methods());