diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2011-05-14 19:17:07 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2011-05-14 19:17:07 +0000 |
| commit | e1e96a6201168c232a06ec81685f948e05fddd39 (patch) | |
| tree | 981bf9fa53571d189d20a1274b0ec7db9d04ef8c /lib | |
| parent | 509f048825d309ca84db136abee32da0c6acffc0 (diff) | |
Revert 131347. It asserts if the specialization in within a class template:
template<class U>
struct X1 {
template<class T> void f(T*);
template<> void f(int*) { }
};
Won't be so simple. I need to think more about it.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@131362 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 10 | ||||
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 9 |
2 files changed, 6 insertions, 13 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 25d23584b8..93857324a1 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -1685,14 +1685,10 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, Decl *OldD) { if (OldMethod && NewMethod) { // Preserve triviality. NewMethod->setTrivial(OldMethod->isTrivial()); - - // MSVC allows explicit template specialization at class scope. - bool IsMSExplicitSpecialization = getLangOptions().Microsoft && - NewMethod->isFunctionTemplateSpecialization(); + bool isFriend = NewMethod->getFriendObjectKind(); - if (!isFriend && NewMethod->getLexicalDeclContext()->isRecord() && - !IsMSExplicitSpecialization) { + if (!isFriend && NewMethod->getLexicalDeclContext()->isRecord()) { // -- Member function declarations with the same name and the // same parameter types cannot be overloaded if any of them // is a static member function declaration. @@ -4573,7 +4569,7 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC, NewFD->setInvalidDecl(); } else if (isFunctionTemplateSpecialization) { if (CurContext->isDependentContext() && CurContext->isRecord() - && !isFriend) { + && !isFriend && !getLangOptions().Microsoft) { Diag(NewFD->getLocation(), diag::err_function_specialization_in_class) << NewFD->getDeclName(); NewFD->setInvalidDecl(); diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 9b14f63301..c31ed01737 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -4401,12 +4401,9 @@ static bool CheckTemplateSpecializationScope(Sema &S, } if (S.CurContext->isRecord() && !IsPartialSpecialization) { - if (S.getLangOptions().Microsoft) - S.Diag(Loc, diag::war_template_spec_decl_class_scope) << Specialized; - else { - S.Diag(Loc, diag::err_template_spec_decl_class_scope) << Specialized; - return true; - } + S.Diag(Loc, diag::err_template_spec_decl_class_scope) + << Specialized; + return true; } // C++ [temp.class.spec]p6: |