[cfe-commits] r135668 - /cfe/trunk/lib/Sema/SemaDeclCXX.cpp

[Eric Christopher]

Author: echristo
Date: Thu Jul 21 00:34:24 2011
New Revision: 135668

URL: http://llvm.org/viewvc/llvm-project?rev=135668&view=rev
Log:
Speculatively revert 135649 to bring back the g++ testing bots.

Modified:
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=135668&r1=135667&r2=135668&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Thu Jul 21 00:34:24 2011
@@ -8263,13 +8263,11 @@
       if (Invalid)
         return 0;
 
-      Decl * Result = CheckClassTemplate(S, TagSpec, TUK_Friend, TagLoc,
-                                         SS, Name, NameLoc, Attr,
-                                         TemplateParams, AS_public,
-                                         TempParamLists.size() - 1,
+      return CheckClassTemplate(S, TagSpec, TUK_Friend, TagLoc,
+                                SS, Name, NameLoc, Attr,
+                                TemplateParams, AS_public,
+                                TempParamLists.size() - 1,
                    (TemplateParameterList**) TempParamLists.release()).take();
-      Result->setAccess(AS_public);
-      return Result;
     } else {
       // The "template<>" header is extraneous.
       Diag(TemplateParams->getTemplateLoc(), diag::err_template_tag_noparams)