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
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 7f35d54..76ec647 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -1052,7 +1052,7 @@
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 @@
// 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 @@
// 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 @@
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))