diff options
| author | Bill Wendling <isanbard@gmail.com> | 2012-12-20 19:22:21 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2012-12-20 19:22:21 +0000 |
| commit | ad017fa7a4df7389d245d02a49b3c79ed70bedb9 (patch) | |
| tree | bcbd290037266bae92bfb10705c40e830ea71a07 /lib/Parse/ParseDeclCXX.cpp | |
| parent | a367a0236211dd2c81a363c4b47b40e0ac6a8797 (diff) | |
Revert r170500. It over-zealously converted *ALL* things named Attributes, which is wrong here.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170721 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 7f35d54b7f..76ec647786 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -1052,7 +1052,7 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind, const ParsedTemplateInfo &TemplateInfo, AccessSpecifier AS, bool EnteringContext, DeclSpecContext DSC, - ParsedAttributesWithRange &Attribute) { + ParsedAttributesWithRange &Attributes) { DeclSpec::TST TagType; if (TagTokKind == tok::kw_struct) TagType = DeclSpec::TST_struct; @@ -1250,7 +1250,7 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind, // For these, DSC is DSC_type_specifier. // If there are attributes after class name, parse them. - MaybeParseCXX0XAttributes(Attribute); + MaybeParseCXX0XAttributes(Attributes); Sema::TagUseKind TUK; if (DSC == DSC_trailing) @@ -1324,7 +1324,7 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind, // to caller to handle. // FIXME: provide fix-it hints if we can. if (TUK != Sema::TUK_Reference) - ProhibitAttributes(Attribute); + ProhibitAttributes(Attributes); // If this is an elaborated type specifier, and we delayed // diagnostics before, just merge them into the current pool. @@ -2258,7 +2258,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, HasInitializer = false; DeclaratorInfo.setCommaLoc(CommaLoc); - // Attribute are only allowed on the second declarator. + // Attributes are only allowed on the second declarator. MaybeParseGNUAttributes(DeclaratorInfo); if (Tok.isNot(tok::colon)) |