3 files changed, 18 insertions, 18 deletions

diff --git a/clang/include/clang/AST/DeclBase.h b/clang/include/clang/AST/DeclBase.h
index b8847389951..0f9fb4569e8 100644
--- a/clang/include/clang/AST/DeclBase.h
+++ b/clang/include/clang/AST/DeclBase.h
@@ -86,13 +86,13 @@ private:
   /// such as "int X, Y, *Z;" this indicates Decl for the next declarator.
   Decl *NextDeclarator;
   
-  /// NextDeclInScope - The next declaration within the same lexical
+  /// NextDeclInContext - The next declaration within the same lexical
   /// DeclContext. These pointers form the linked list that is
   /// traversed via DeclContext's decls_begin()/decls_end().
   /// FIXME: If NextDeclarator is non-NULL, will it always be the same
-  /// as NextDeclInScope? If so, we can use a
+  /// as NextDeclInContext? If so, we can use a
   /// PointerIntPair<Decl*, 1> to make Decl smaller.
-  Decl *NextDeclInScope;
+  Decl *NextDeclInContext;
 
   friend class DeclContext;
 
@@ -160,7 +160,7 @@ protected:
   friend class CXXClassMemberWrapper;
 
   Decl(Kind DK, DeclContext *DC, SourceLocation L) 
-    : NextDeclarator(0), NextDeclInScope(0), 
+    : NextDeclarator(0), NextDeclInContext(0), 
       DeclCtx(DC, 0), 
       Loc(L), DeclKind(DK), InvalidDecl(0),
       HasAttrs(false), Implicit(false), 
@@ -181,8 +181,8 @@ public:
   Kind getKind() const { return DeclKind; }
   const char *getDeclKindName() const;
   
-  Decl *getNextDeclInScope() { return NextDeclInScope; }
-  const Decl *getNextDeclInScope() const { return NextDeclInScope; }
+  Decl *getNextDeclInContext() { return NextDeclInContext; }
+  const Decl *getNextDeclInContext() const { return NextDeclInContext; }
 
   DeclContext *getDeclContext() {
     if (isInSemaDC())
@@ -529,7 +529,7 @@ public:
     pointer operator->() const { return Current; }
 
     decl_iterator& operator++() {
-      Current = Current->getNextDeclInScope();
+      Current = Current->getNextDeclInContext();
       return *this;
     }
 
diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp
index 72ac5552201..634c86e361d 100644
--- a/clang/lib/AST/DeclBase.cpp
+++ b/clang/lib/AST/DeclBase.cpp
@@ -282,15 +282,15 @@ void Decl::Destroy(ASTContext &C) {
   if (DeclContext *DC = dyn_cast<DeclContext>(this))
     DC->decls_begin()->Destroy(C);
 
-  // Observe the unrolled recursion.  By setting N->NextDeclInScope = 0x0
+  // Observe the unrolled recursion.  By setting N->NextDeclInContext = 0x0
   // within the loop, only the Destroy method for the first Decl
   // will deallocate all of the Decls in a chain.
   
-  Decl* N = NextDeclInScope;
+  Decl* N = getNextDeclInContext();
   
   while (N) {
-    Decl* Tmp = N->NextDeclInScope;
-    N->NextDeclInScope = 0;
+    Decl* Tmp = N->getNextDeclInContext();
+    N->NextDeclInContext = 0;
     N->Destroy(C);
     N = Tmp;
   }  
@@ -541,7 +541,7 @@ DeclContext *DeclContext::getPrimaryContext() {
     if (DeclKind >= Decl::TagFirst && DeclKind <= Decl::TagLast) {
       // If this is a tag type that has a definition or is currently
       // being defined, that definition is our primary context.
-      if (const TagType *TagT = cast<TagDecl>(this)->TypeForDecl->getAsTagType())
+      if (const TagType *TagT =cast<TagDecl>(this)->TypeForDecl->getAsTagType())
         if (TagT->isBeingDefined() || 
             (TagT->getDecl() && TagT->getDecl()->isDefinition()))
           return TagT->getDecl();
@@ -568,11 +568,11 @@ DeclContext *DeclContext::getNextContext() {
 void DeclContext::addDecl(Decl *D) {
   assert(D->getLexicalDeclContext() == this &&
          "Decl inserted into wrong lexical context");
-  assert(!D->NextDeclInScope && D != LastDecl && 
+  assert(!D->getNextDeclInContext() && D != LastDecl && 
          "Decl already inserted into a DeclContext");
 
   if (FirstDecl) {
-    LastDecl->NextDeclInScope = D;
+    LastDecl->NextDeclInContext = D;
     LastDecl = D;
   } else {
     FirstDecl = LastDecl = D;
diff --git a/clang/lib/AST/DeclSerialization.cpp b/clang/lib/AST/DeclSerialization.cpp
index 4b32d819365..7ac7ac49b09 100644
--- a/clang/lib/AST/DeclSerialization.cpp
+++ b/clang/lib/AST/DeclSerialization.cpp
@@ -46,10 +46,10 @@ void Decl::Emit(Serializer& S) const {
   if (getDeclContext() && 
       !getDeclContext()->isFunctionOrMethod()) {
     S.EmitBool(true);
-    S.EmitOwnedPtr(NextDeclInScope);
+    S.EmitOwnedPtr(NextDeclInContext);
   } else {
     S.EmitBool(false);
-    S.EmitPtr(NextDeclInScope);
+    S.EmitPtr(NextDeclInContext);
   }
 }
 
@@ -151,9 +151,9 @@ Decl* Decl::Create(Deserializer& D, ASTContext& C) {
     DC->ReadOutRec(D, C);
   bool OwnsNext = D.ReadBool();
   if (OwnsNext)
-    Dcl->NextDeclInScope = D.ReadOwnedPtr<Decl>(C);
+    Dcl->NextDeclInContext = D.ReadOwnedPtr<Decl>(C);
   else 
-    D.ReadPtr(Dcl->NextDeclInScope);
+    D.ReadPtr(Dcl->NextDeclInContext);
   return Dcl;
 }