[cfe-commits] r132546 - in /cfe/trunk/lib/Sema: SemaDecl.cpp SemaTemplate.cpp

[Francois Pichet]

Author: fpichet
Date: Fri Jun  3 08:59:45 2011
New Revision: 132546

URL: http://llvm.org/viewvc/llvm-project?rev=132546&view=rev
Log:
Revert r132544. Accidental commit. I got confused with the Tortoise SVN menu.

Modified:
    cfe/trunk/lib/Sema/SemaDecl.cpp
    cfe/trunk/lib/Sema/SemaTemplate.cpp

Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=132546&r1=132545&r2=132546&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Fri Jun  3 08:59:45 2011
@@ -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();

Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=132546&r1=132545&r2=132546&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Fri Jun  3 08:59:45 2011
@@ -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;