diff options
| author | Sean Hunt <scshunt@csclub.uwaterloo.ca> | 2011-05-06 21:24:28 +0000 |
|---|---|---|
| committer | Sean Hunt <scshunt@csclub.uwaterloo.ca> | 2011-05-06 21:24:28 +0000 |
| commit | bb85f8edca8103aa10e4b2f4a6fcc3a251b0ea03 (patch) | |
| tree | 6b23217d1dfa6e1be7f752bf2fcd5b0b78d483d8 /lib/Parse/ParseDeclCXX.cpp | |
| parent | 26dc3e08da33594bb2fe5466ce48b4544a626cf0 (diff) | |
Per Richard's suggestion, rename DefLoc to DefaultLoc where it appears.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@131018 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index d263f96e26..ccc245016e 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -1648,7 +1648,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, ExprResult BitfieldSize; ExprResult Init; bool Deleted = false; - SourceLocation DefLoc; + SourceLocation DefaultLoc; while (1) { // member-declarator: @@ -1683,7 +1683,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, } else if (Tok.is(tok::kw_default)) { if (!getLang().CPlusPlus0x) Diag(Tok, diag::warn_defaulted_function_accepted_as_extension); - DefLoc = ConsumeToken(); + DefaultLoc = ConsumeToken(); } else { Init = ParseInitializer(); if (Init.isInvalid()) @@ -1711,8 +1711,8 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, Decl *ThisDecl = 0; if (DS.isFriendSpecified()) { - if (DefLoc.isValid()) - Diag(DefLoc, diag::err_default_special_members); + if (DefaultLoc.isValid()) + Diag(DefaultLoc, diag::err_default_special_members); // TODO: handle initializers, bitfields, 'delete' ThisDecl = Actions.ActOnFriendFunctionDecl(getCurScope(), DeclaratorInfo, @@ -1725,7 +1725,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, BitfieldSize.release(), VS, Init.release(), /*IsDefinition*/Deleted, - Deleted, DefLoc); + Deleted, DefaultLoc); } if (ThisDecl) DeclsInGroup.push_back(ThisDecl); @@ -1752,7 +1752,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, BitfieldSize = 0; Init = 0; Deleted = false; - DefLoc = SourceLocation(); + DefaultLoc = SourceLocation(); // Attributes are only allowed on the second declarator. MaybeParseGNUAttributes(DeclaratorInfo); |