diff options
Diffstat (limited to 'lib/ARCMigrate/TransGCAttrs.cpp')
| -rw-r--r-- | lib/ARCMigrate/TransGCAttrs.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ARCMigrate/TransGCAttrs.cpp b/lib/ARCMigrate/TransGCAttrs.cpp index 2ae6b78a46348..4fd21aa6c2699 100644 --- a/lib/ARCMigrate/TransGCAttrs.cpp +++ b/lib/ARCMigrate/TransGCAttrs.cpp @@ -23,7 +23,7 @@ using namespace trans; namespace { -/// \brief Collects all the places where GC attributes __strong/__weak occur. +/// Collects all the places where GC attributes __strong/__weak occur. class GCAttrsCollector : public RecursiveASTVisitor<GCAttrsCollector> { MigrationContext &MigrateCtx; bool FullyMigratable; @@ -92,7 +92,7 @@ public: ASTContext &Ctx = MigrateCtx.Pass.Ctx; SourceManager &SM = Ctx.getSourceManager(); if (Loc.isMacroID()) - Loc = SM.getImmediateExpansionRange(Loc).first; + Loc = SM.getImmediateExpansionRange(Loc).getBegin(); SmallString<32> Buf; bool Invalid = false; StringRef Spell = Lexer::getSpelling( @@ -287,7 +287,8 @@ static void checkAllAtProps(MigrationContext &MigrateCtx, SourceLocation Loc = ATLs[i].first.getAttrNameLoc(); if (Loc.isMacroID()) Loc = MigrateCtx.Pass.Ctx.getSourceManager() - .getImmediateExpansionRange(Loc).first; + .getImmediateExpansionRange(Loc) + .getBegin(); TA.remove(Loc); TA.clearDiagnostic(diag::err_objc_property_attr_mutually_exclusive, AtLoc); TA.clearDiagnostic(diag::err_arc_inconsistent_property_ownership, |