From 75b767544c872ca8911d0c8b9680a0758a5745f4 Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Fri, 14 Mar 2014 19:41:04 +0000 Subject: [PATCH] [C++11] Replacing CapturedStmt iterators capture_init_begin() and capture_init_end() with iterator_range capture_inits(). Updating all of the usages of the iterators with range-based for loops. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@203959 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/Stmt.h | 5 +++++ lib/Serialization/ASTWriterStmt.cpp | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h index e71a4999b6..d1fb0640fc 100644 --- a/include/clang/AST/Stmt.h +++ b/include/clang/AST/Stmt.h @@ -2073,6 +2073,11 @@ public: /// \brief Iterator that walks over the capture initialization arguments. typedef Expr **capture_init_iterator; + typedef llvm::iterator_range capture_init_range; + + capture_init_range capture_inits() const { + return capture_init_range(capture_init_begin(), capture_init_end()); + } /// \brief Retrieve the first initialization argument. capture_init_iterator capture_init_begin() const { diff --git a/lib/Serialization/ASTWriterStmt.cpp b/lib/Serialization/ASTWriterStmt.cpp index 17de845d3b..05cbb5bd48 100644 --- a/lib/Serialization/ASTWriterStmt.cpp +++ b/lib/Serialization/ASTWriterStmt.cpp @@ -300,10 +300,8 @@ void ASTStmtWriter::VisitCapturedStmt(CapturedStmt *S) { Writer.AddDeclRef(S->getCapturedRecordDecl(), Record); // Capture inits - for (CapturedStmt::capture_init_iterator I = S->capture_init_begin(), - E = S->capture_init_end(); - I != E; ++I) - Writer.AddStmt(*I); + for (auto *I : S->capture_inits()) + Writer.AddStmt(I); // Body Writer.AddStmt(S->getCapturedStmt()); -- 2.40.0