diff options
| -rw-r--r-- | include/clang/AST/Decl.h | 6 | ||||
| -rw-r--r-- | lib/AST/Decl.cpp | 2 | ||||
| -rw-r--r-- | lib/AST/DeclSerialization.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index 8197e46c87..d0cd999f9a 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -66,7 +66,7 @@ protected: : NamedDecl(DK, L, Id), NextDeclarator(PrevDecl), Next(0), CtxDecl(CD) {} public: - ContextDecl *getContext() const { return CtxDecl; } + ContextDecl *getContextDecl() const { return CtxDecl; } ScopedDecl *getNext() const { return Next; } void setNext(ScopedDecl *N) { Next = N; } @@ -83,8 +83,8 @@ public: // roughly global variables and functions, but also handles enums (which could // be defined inside or outside a function etc). bool isDefinedOutsideFunctionOrMethod() const { - if (getContext()) - return !getContext()->isFunctionOrMethod(); + if (getContextDecl()) + return !getContextDecl()->isFunctionOrMethod(); else return true; } diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index 38a20c1c01..b1a2499949 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -335,7 +335,7 @@ const Attr *Decl::getAttrs() const { ContextDecl *ContextDecl::getParent() const { if (ScopedDecl *SD = dyn_cast<ScopedDecl>(this)) - return SD->getContext(); + return SD->getContextDecl(); else return NULL; } diff --git a/lib/AST/DeclSerialization.cpp b/lib/AST/DeclSerialization.cpp index 3a79b9e0e2..e6b3f93096 100644 --- a/lib/AST/DeclSerialization.cpp +++ b/lib/AST/DeclSerialization.cpp @@ -106,7 +106,7 @@ void NamedDecl::ReadInRec(Deserializer& D) { void ScopedDecl::EmitInRec(Serializer& S) const { NamedDecl::EmitInRec(S); S.EmitPtr(getNext()); // From ScopedDecl. - S.EmitPtr(cast_or_null<Decl>(getContext())); // From ScopedDecl. + S.EmitPtr(cast_or_null<Decl>(getContextDecl())); // From ScopedDecl. } void ScopedDecl::ReadInRec(Deserializer& D) { |