diff options
Diffstat (limited to 'clang/tools/libclang')
| -rw-r--r-- | clang/tools/libclang/CIndex.cpp | 5 | ||||
| -rw-r--r-- | clang/tools/libclang/Indexing.cpp | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index b8e44a2124c..6c603afb5c1 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -240,9 +240,8 @@ static bool visitPreprocessedEntitiesInRange(SourceRange R, FID = FileID(); } - std::pair<PreprocessingRecord::iterator, PreprocessingRecord::iterator> - Entities = PPRec.getPreprocessedEntitiesInRange(R); - return Visitor.visitPreprocessedEntities(Entities.first, Entities.second, + const auto &Entities = PPRec.getPreprocessedEntitiesInRange(R); + return Visitor.visitPreprocessedEntities(Entities.begin(), Entities.end(), PPRec, FID); } diff --git a/clang/tools/libclang/Indexing.cpp b/clang/tools/libclang/Indexing.cpp index 20f4474a1ee..20df33e8420 100644 --- a/clang/tools/libclang/Indexing.cpp +++ b/clang/tools/libclang/Indexing.cpp @@ -697,13 +697,8 @@ static void indexPreprocessingRecord(ASTUnit &Unit, IndexingContext &IdxCtx) { // FIXME: Only deserialize inclusion directives. - PreprocessingRecord::iterator I, E; - std::tie(I, E) = Unit.getLocalPreprocessingEntities(); - bool isModuleFile = Unit.isModuleFile(); - for (; I != E; ++I) { - PreprocessedEntity *PPE = *I; - + for (PreprocessedEntity *PPE : Unit.getLocalPreprocessingEntities()) { if (InclusionDirective *ID = dyn_cast<InclusionDirective>(PPE)) { SourceLocation Loc = ID->getSourceRange().getBegin(); // Modules have synthetic main files as input, give an invalid location |
