diff options
author | Douglas Gregor <dgregor@apple.com> | 2011-02-04 12:22:53 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2011-02-04 12:22:53 +0000 |
commit | 461bf2eb82981d00a014409126ef9c3538551a94 (patch) | |
tree | 285805622dc2780c58155a450f930430349c702c /lib/Sema/SemaTemplate.cpp | |
parent | def0354384d9c4431f7b58b664b59896d4623028 (diff) |
Tweak my fix for PR8748, and update the incorrect PR number in the test case.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124863 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplate.cpp')
-rw-r--r-- | lib/Sema/SemaTemplate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index e867354273..88ba3f9a88 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -947,7 +947,8 @@ Sema::CheckClassTemplate(Scope *S, unsigned TagSpec, TagUseKind TUK, if (CheckTemplateParameterList(TemplateParams, PrevClassTemplate? PrevClassTemplate->getTemplateParameters() : 0, (SS.isSet() && SemanticContext && - SemanticContext->isRecord()) + SemanticContext->isRecord() && + SemanticContext->isDependentContext()) ? TPC_ClassTemplateMember : TPC_ClassTemplate)) Invalid = true; |