diff options
| -rw-r--r-- | include/clang/AST/DeclObjC.h | 8 | ||||
| -rw-r--r-- | lib/AST/DeclObjC.cpp | 8 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h index 450fdc55f6..88cf2276c7 100644 --- a/include/clang/AST/DeclObjC.h +++ b/include/clang/AST/DeclObjC.h @@ -504,13 +504,13 @@ public: }; private: - ObjCIvarDecl(SourceLocation L, IdentifierInfo *Id, QualType T, - AccessControl ac, Expr *BW) - : FieldDecl(ObjCIvar, 0, L, Id, T, BW, /*Mutable=*/false), + ObjCIvarDecl(DeclContext *DC, SourceLocation L, IdentifierInfo *Id, + QualType T, AccessControl ac, Expr *BW) + : FieldDecl(ObjCIvar, DC, L, Id, T, BW, /*Mutable=*/false), DeclAccess(ac) {} public: - static ObjCIvarDecl *Create(ASTContext &C, SourceLocation L, + static ObjCIvarDecl *Create(ASTContext &C, DeclContext *DC, SourceLocation L, IdentifierInfo *Id, QualType T, AccessControl ac, Expr *BW = NULL); diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp index 162ead60f8..506d3e4c38 100644 --- a/lib/AST/DeclObjC.cpp +++ b/lib/AST/DeclObjC.cpp @@ -78,10 +78,10 @@ void ObjCInterfaceDecl::Destroy(ASTContext& C) { } -ObjCIvarDecl *ObjCIvarDecl::Create(ASTContext &C, SourceLocation L, - IdentifierInfo *Id, QualType T, - AccessControl ac, Expr *BW) { - return new (C) ObjCIvarDecl(L, Id, T, ac, BW); +ObjCIvarDecl *ObjCIvarDecl::Create(ASTContext &C, DeclContext *DC, + SourceLocation L, IdentifierInfo *Id, + QualType T, AccessControl ac, Expr *BW) { + return new (C) ObjCIvarDecl(DC, L, Id, T, ac, BW); } diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index b5e6bd6973..5eb2e6a95b 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -3559,7 +3559,7 @@ Sema::DeclTy *Sema::ActOnIvar(Scope *S, : ObjCIvarDecl::None; // Construct the decl. - ObjCIvarDecl *NewID = ObjCIvarDecl::Create(Context, Loc, II, T, ac, + ObjCIvarDecl *NewID = ObjCIvarDecl::Create(Context, CurContext, Loc, II, T,ac, (Expr *)BitfieldWidth); if (II) { |