diff options
| author | Eric Christopher <echristo@apple.com> | 2011-07-21 05:34:24 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2011-07-21 05:34:24 +0000 |
| commit | 6f228b5a5364ba1ab0432c441294ae24b7e85dd3 (patch) | |
| tree | 46ba6c72577e71822103a2e2db2744a116a69721 | |
| parent | 86070b9c0ff1022409406b27b69d9f56948312cf (diff) | |
| download | bcm5719-llvm-6f228b5a5364ba1ab0432c441294ae24b7e85dd3.tar.gz bcm5719-llvm-6f228b5a5364ba1ab0432c441294ae24b7e85dd3.zip | |
Speculatively revert 135649 to bring back the g++ testing bots.
llvm-svn: 135668
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
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) |
