commit 461bf2eb82981d00a014409126ef9c3538551a94
author Douglas Gregor <dgregor@apple.com> Fri Feb 04 12:22:53 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Fri Feb 04 12:22:53 2011 +0000
tree 285805622dc2780c58155a450f930430349c702c
parent def0354384d9c4431f7b58b664b59896d4623028

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

lib/Sema/SemaTemplate.cpp

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index e867354..88ba3f9 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -947,7 +947,8 @@
   if (CheckTemplateParameterList(TemplateParams,
             PrevClassTemplate? PrevClassTemplate->getTemplateParameters() : 0,
                                  (SS.isSet() && SemanticContext &&
-                                  SemanticContext->isRecord())
+                                  SemanticContext->isRecord() &&
+                                  SemanticContext->isDependentContext())
                                    ? TPC_ClassTemplateMember
                                    : TPC_ClassTemplate))
     Invalid = true;