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/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index a4c3239..bde650b 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -967,9 +967,7 @@
 
       Actions.SetDeclDeleted(ThisDecl, DelLoc);
     } else if (Tok.is(tok::kw_default)) {
-      SourceLocation DefLoc = ConsumeToken();
-
-      Diag(DefLoc, diag::err_default_special_members);
+      Diag(ConsumeToken(), diag::err_default_special_members);
     } else {
       if (getLang().CPlusPlus && D.getCXXScopeSpec().isSet()) {
         EnterScope(0);

lib/Parse/ParseDeclCXX.cpp

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index d263f96..ccc2450 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -1648,7 +1648,7 @@
   ExprResult BitfieldSize;
   ExprResult Init;
   bool Deleted = false;
-  SourceLocation DefLoc;
+  SourceLocation DefaultLoc;
 
   while (1) {
     // member-declarator:
@@ -1683,7 +1683,7 @@
       } 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 @@
 
     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 @@
                                                   BitfieldSize.release(),
                                                   VS, Init.release(),
                                                   /*IsDefinition*/Deleted,
-                                                  Deleted, DefLoc);
+                                                  Deleted, DefaultLoc);
     }
     if (ThisDecl)
       DeclsInGroup.push_back(ThisDecl);
@@ -1752,7 +1752,7 @@
     BitfieldSize = 0;
     Init = 0;
     Deleted = false;
-    DefLoc = SourceLocation();
+    DefaultLoc = SourceLocation();
 
     // Attributes are only allowed on the second declarator.
     MaybeParseGNUAttributes(DeclaratorInfo);