diff options
| author | Alexis Hunt <alercah@gmail.com> | 2011-01-08 23:01:16 +0000 |
|---|---|---|
| committer | Alexis Hunt <alercah@gmail.com> | 2011-01-08 23:01:16 +0000 |
| commit | a50dd46ee80b53f27ed49bf7373d937c2441972d (patch) | |
| tree | 721dfe59c3718826f47951afe2592705f2f6de15 /clang/lib/AST | |
| parent | c925f02863282aeabe5f172c0e2e609187963499 (diff) | |
| download | bcm5719-llvm-a50dd46ee80b53f27ed49bf7373d937c2441972d.tar.gz bcm5719-llvm-a50dd46ee80b53f27ed49bf7373d937c2441972d.zip | |
Rename CXXCtorInitializer::BaseOrMember to Initializee, since it will also be
used to store the CXXConstructorDecl in a delegating constructor.
llvm-svn: 123095
Diffstat (limited to 'clang/lib/AST')
| -rw-r--r-- | clang/lib/AST/DeclCXX.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp index be87d3cbb8b..0d55b51778a 100644 --- a/clang/lib/AST/DeclCXX.cpp +++ b/clang/lib/AST/DeclCXX.cpp @@ -1004,7 +1004,7 @@ CXXCtorInitializer::CXXCtorInitializer(ASTContext &Context, SourceLocation L, Expr *Init, SourceLocation R, SourceLocation EllipsisLoc) - : BaseOrMember(TInfo), MemberOrEllipsisLocation(EllipsisLoc), Init(Init), + : Initializee(TInfo), MemberOrEllipsisLocation(EllipsisLoc), Init(Init), LParenLoc(L), RParenLoc(R), IsVirtual(IsVirtual), IsWritten(false), SourceOrderOrNumArrayIndices(0) { @@ -1015,7 +1015,7 @@ CXXCtorInitializer::CXXCtorInitializer(ASTContext &Context, SourceLocation MemberLoc, SourceLocation L, Expr *Init, SourceLocation R) - : BaseOrMember(Member), MemberOrEllipsisLocation(MemberLoc), Init(Init), + : Initializee(Member), MemberOrEllipsisLocation(MemberLoc), Init(Init), LParenLoc(L), RParenLoc(R), IsVirtual(false), IsWritten(false), SourceOrderOrNumArrayIndices(0) { @@ -1026,7 +1026,7 @@ CXXCtorInitializer::CXXCtorInitializer(ASTContext &Context, SourceLocation MemberLoc, SourceLocation L, Expr *Init, SourceLocation R) - : BaseOrMember(Member), MemberOrEllipsisLocation(MemberLoc), Init(Init), + : Initializee(Member), MemberOrEllipsisLocation(MemberLoc), Init(Init), LParenLoc(L), RParenLoc(R), IsVirtual(false), IsWritten(false), SourceOrderOrNumArrayIndices(0) { @@ -1039,7 +1039,7 @@ CXXCtorInitializer::CXXCtorInitializer(ASTContext &Context, SourceLocation R, VarDecl **Indices, unsigned NumIndices) - : BaseOrMember(Member), MemberOrEllipsisLocation(MemberLoc), Init(Init), + : Initializee(Member), MemberOrEllipsisLocation(MemberLoc), Init(Init), LParenLoc(L), RParenLoc(R), IsVirtual(false), IsWritten(false), SourceOrderOrNumArrayIndices(NumIndices) { @@ -1057,27 +1057,27 @@ CXXCtorInitializer *CXXCtorInitializer::Create(ASTContext &Context, void *Mem = Context.Allocate(sizeof(CXXCtorInitializer) + sizeof(VarDecl *) * NumIndices, llvm::alignOf<CXXCtorInitializer>()); - return new (Mem) CXXCtorInitializer(Context, Member, MemberLoc, - L, Init, R, Indices, NumIndices); + return new (Mem) CXXCtorInitializer(Context, Member, MemberLoc, L, Init, R, + Indices, NumIndices); } TypeLoc CXXCtorInitializer::getBaseClassLoc() const { if (isBaseInitializer()) - return BaseOrMember.get<TypeSourceInfo*>()->getTypeLoc(); + return Initializee.get<TypeSourceInfo*>()->getTypeLoc(); else return TypeLoc(); } Type *CXXCtorInitializer::getBaseClass() { if (isBaseInitializer()) - return BaseOrMember.get<TypeSourceInfo*>()->getType().getTypePtr(); + return Initializee.get<TypeSourceInfo*>()->getType().getTypePtr(); else return 0; } const Type *CXXCtorInitializer::getBaseClass() const { if (isBaseInitializer()) - return BaseOrMember.get<TypeSourceInfo*>()->getType().getTypePtr(); + return Initializee.get<TypeSourceInfo*>()->getType().getTypePtr(); else return 0; } |
