diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 10 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaTemplate.cpp | 9 |
2 files changed, 6 insertions, 13 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 25d23584b8f..93857324a1f 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/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/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index 9b14f633013..c31ed017377 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/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: |
