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 | 4d5c297607e6db63b6f586ddd04477659adb6590 (patch) | |
| tree | bf762d5088be9b70543a04f54b3dea1daf9962d9 /clang/lib | |
| parent | 87866ceda70f6ab0664dc7eb3bf7f71fd79cf379 (diff) | |
| download | bcm5719-llvm-4d5c297607e6db63b6f586ddd04477659adb6590.tar.gz bcm5719-llvm-4d5c297607e6db63b6f586ddd04477659adb6590.zip | |
Tweak my fix for PR8748, and update the incorrect PR number in the test case.
llvm-svn: 124863
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaTemplate.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 88c3a770c27..9db68144666 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -3972,7 +3972,8 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC, ? TPC_FriendFunctionTemplateDefinition : TPC_FriendFunctionTemplate) : (D.getCXXScopeSpec().isSet() && - DC && DC->isRecord()) + DC && DC->isRecord() && + DC->isDependentContext()) ? TPC_ClassTemplateMember : TPC_FunctionTemplate); } diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index e867354273f..88ba3f9a885 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/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; |
