diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2011-06-03 13:51:55 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2011-06-03 13:51:55 +0000 |
| commit | 696df647c22b4bc632c68777eca1f667ae5dcad4 (patch) | |
| tree | a8dc5514f0a6a77b173cf91dd3c72e67d1fb27fd /lib/Sema/SemaDecl.cpp | |
| parent | 9af535a0116c5f7159830ef98603d8142b3217a6 (diff) | |
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@132544 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 5de1838b9f..d77bda7676 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -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(); |