diff options
Diffstat (limited to 'clang/lib/ARCMigrate/TransGCAttrs.cpp')
| -rw-r--r-- | clang/lib/ARCMigrate/TransGCAttrs.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/clang/lib/ARCMigrate/TransGCAttrs.cpp b/clang/lib/ARCMigrate/TransGCAttrs.cpp index 5e3162197ed1..8f5f3cff17cb 100644 --- a/clang/lib/ARCMigrate/TransGCAttrs.cpp +++ b/clang/lib/ARCMigrate/TransGCAttrs.cpp @@ -231,8 +231,7 @@ static void checkAllAtProps(MigrationContext &MigrateCtx, SmallVector<std::pair<AttributedTypeLoc, ObjCPropertyDecl *>, 4> ATLs; bool hasWeak = false, hasStrong = false; - ObjCPropertyDecl::PropertyAttributeKind - Attrs = ObjCPropertyDecl::OBJC_PR_noattr; + ObjCPropertyAttribute::Kind Attrs = ObjCPropertyAttribute::kind_noattr; for (IndivPropsTy::iterator PI = IndProps.begin(), PE = IndProps.end(); PI != PE; ++PI) { ObjCPropertyDecl *PD = *PI; @@ -274,7 +273,7 @@ static void checkAllAtProps(MigrationContext &MigrateCtx, else toAttr = "unsafe_unretained"; } - if (Attrs & ObjCPropertyDecl::OBJC_PR_assign) + if (Attrs & ObjCPropertyAttribute::kind_assign) MigrateCtx.rewritePropertyAttribute("assign", toAttr, AtLoc); else MigrateCtx.addPropertyAttribute(toAttr, AtLoc); @@ -302,8 +301,8 @@ static void checkAllProps(MigrationContext &MigrateCtx, for (unsigned i = 0, e = AllProps.size(); i != e; ++i) { ObjCPropertyDecl *PD = AllProps[i]; if (PD->getPropertyAttributesAsWritten() & - (ObjCPropertyDecl::OBJC_PR_assign | - ObjCPropertyDecl::OBJC_PR_readonly)) { + (ObjCPropertyAttribute::kind_assign | + ObjCPropertyAttribute::kind_readonly)) { SourceLocation AtLoc = PD->getAtLoc(); if (AtLoc.isInvalid()) continue; |