commit b503705e0d37fadb28287232ccadb4fdf7f546e5
author Francois Pichet <pichet2000@gmail.com> Fri Jun 03 13:59:45 2011 +0000
committer Francois Pichet <pichet2000@gmail.com> Fri Jun 03 13:59:45 2011 +0000
tree 375be376851de8bfa2b1073c8d677ad5a2c894ad
parent f8da5b22af16dd303417175b5edee3b439346a43

Revert r132544. Accidental commit. I got confused with the Tortoise SVN menu.

llvm-svn: 132546

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index d77bda7..5de1838 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -4587,7 +4587,7 @@
         NewFD->setInvalidDecl();
     } else if (isFunctionTemplateSpecialization) {
       if (CurContext->isDependentContext() && CurContext->isRecord() 
-          && !isFriend && !getLangOptions().Microsoft) {
+          && !isFriend) {
         Diag(NewFD->getLocation(), diag::err_function_specialization_in_class)
           << NewFD->getDeclName();
         NewFD->setInvalidDecl();

clang/lib/Sema/SemaTemplate.cpp

diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index 495d624..3761740 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -5313,8 +5313,6 @@
 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;