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/Sema/SemaDeclCXX.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/Sema/SemaDeclCXX.cpp')
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 41b09df9ca..bc6584bc73 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -963,7 +963,7 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D, MultiTemplateParamsArg TemplateParameterLists, ExprTy *BW, const VirtSpecifiers &VS, ExprTy *InitExpr, bool IsDefinition, - bool Deleted, SourceLocation DefLoc) { + bool Deleted, SourceLocation DefaultLoc) { const DeclSpec &DS = D.getDeclSpec(); DeclarationNameInfo NameInfo = GetNameForDeclarator(D); DeclarationName Name = NameInfo.getName(); @@ -1028,8 +1028,8 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D, if (isInstField) { CXXScopeSpec &SS = D.getCXXScopeSpec(); - if (DefLoc.isValid()) - Diag(DefLoc, diag::err_default_special_members); + if (DefaultLoc.isValid()) + Diag(DefaultLoc, diag::err_default_special_members); if (SS.isSet() && !SS.isInvalid()) { // The user provided a superfluous scope specifier inside a class @@ -1056,7 +1056,7 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D, assert(Member && "HandleField never returns null"); } else { Member = HandleDeclarator(S, D, move(TemplateParameterLists), IsDefinition, - DefLoc); + DefaultLoc); if (!Member) { return 0; } |