diff options
author | Gabor Greif <ggreif@gmail.com> | 2009-08-27 06:49:21 +0000 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2009-08-27 06:49:21 +0000 |
commit | f5afb5e1fa1877a4adf3328e5be31b2f959d82eb (patch) | |
tree | c19eb26db06d748deae044d5afdda60ec0ecef12 | |
parent | 6dd38daf1495367db8fe9e9a5cacb7420cf08e27 (diff) |
iterator.h is no more. Be standards compliant.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80225 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/clang/AST/Stmt.h | 1 | ||||
-rw-r--r-- | include/clang/AST/StmtIterator.h | 2 | ||||
-rw-r--r-- | include/clang/Rewrite/RewriteRope.h | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h index 3b790caf75..f34776373b 100644 --- a/include/clang/AST/Stmt.h +++ b/include/clang/AST/Stmt.h @@ -21,7 +21,6 @@ #include "clang/AST/StmtIterator.h" #include "clang/AST/DeclGroup.h" #include "llvm/ADT/SmallVector.h" -#include "llvm/ADT/iterator.h" #include "clang/AST/ASTContext.h" #include <string> using llvm::dyn_cast_or_null; diff --git a/include/clang/AST/StmtIterator.h b/include/clang/AST/StmtIterator.h index 35bd5ada02..2a4adc6f79 100644 --- a/include/clang/AST/StmtIterator.h +++ b/include/clang/AST/StmtIterator.h @@ -14,9 +14,9 @@ #ifndef LLVM_CLANG_AST_STMT_ITR_H #define LLVM_CLANG_AST_STMT_ITR_H -#include "llvm/ADT/iterator.h" #include "llvm/Support/DataTypes.h" #include <cassert> +#include <iterator> namespace clang { diff --git a/include/clang/Rewrite/RewriteRope.h b/include/clang/Rewrite/RewriteRope.h index 7faa451290..fa5464bf3e 100644 --- a/include/clang/Rewrite/RewriteRope.h +++ b/include/clang/Rewrite/RewriteRope.h @@ -14,9 +14,9 @@ #ifndef LLVM_CLANG_REWRITEROPE_H #define LLVM_CLANG_REWRITEROPE_H -#include "llvm/ADT/iterator.h" #include <cstring> #include <cassert> +#include <iterator> namespace clang { //===--------------------------------------------------------------------===// @@ -102,7 +102,7 @@ namespace clang { /// in a RopePiece, then iterates over RopePiece's in a RopePieceBTreeLeaf, /// then iterates over RopePieceBTreeLeaf's in a RopePieceBTree. class RopePieceBTreeIterator : - public forward_iterator<const char, ptrdiff_t> { + public std::iterator<std::forward_iterator_tag, const char, ptrdiff_t> { /// CurNode - The current B+Tree node that we are inspecting. const void /*RopePieceBTreeLeaf*/ *CurNode; /// CurPiece - The current RopePiece in the B+Tree node that we're |