commit bb85f8edca8103aa10e4b2f4a6fcc3a251b0ea03
author Sean Hunt <scshunt@csclub.uwaterloo.ca> Fri May 06 21:24:28 2011 +0000
committer Sean Hunt <scshunt@csclub.uwaterloo.ca> Fri May 06 21:24:28 2011 +0000
tree 6b23217d1dfa6e1be7f752bf2fcd5b0b78d483d8
parent 26dc3e08da33594bb2fe5466ce48b4544a626cf0

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

lib/Sema/SemaDeclCXX.cpp

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 41b09df..bc6584b 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -963,7 +963,7 @@
                                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 @@
   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 @@
     assert(Member && "HandleField never returns null");
   } else {
     Member = HandleDeclarator(S, D, move(TemplateParameterLists), IsDefinition,
-                              DefLoc);
+                              DefaultLoc);
     if (!Member) {
       return 0;
     }