(no commit message)

llvm-svn: 132544
This commit is contained in:
Francois Pichet 2011-06-03 13:51:55 +00:00
parent 55d4989304
commit d4de06861d
2 changed files with 3 additions and 1 deletions

View File

@ -4587,7 +4587,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();

View File

@ -5313,6 +5313,8 @@ bool
Sema::CheckFunctionTemplateSpecialization(FunctionDecl *FD,
TemplateArgumentListInfo *ExplicitTemplateArgs,
LookupResult &Previous) {
return false;
// The set of function template specializations that could match this
// explicit function template specialization.
UnresolvedSet<8> Candidates;