From 6f228b5a5364ba1ab0432c441294ae24b7e85dd3 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Thu, 21 Jul 2011 05:34:24 +0000 Subject: Speculatively revert 135649 to bring back the g++ testing bots. llvm-svn: 135668 --- clang/lib/Sema/SemaDeclCXX.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'clang/lib/Sema/SemaDeclCXX.cpp') diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 03280451452..9ad9a2f0f0a 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -8263,13 +8263,11 @@ Decl *Sema::ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc, 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) -- cgit v1.2.3