diff options
author | Gabor Greif <ggreif@gmail.com> | 2009-08-27 06:41:46 +0000 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2009-08-27 06:41:46 +0000 |
commit | f0891be8bdbeeadb39da5575273b6645755fa383 (patch) | |
tree | 344541d698e7fdc4ee3f8a118d3590da66510e6d /include/llvm/ADT/DepthFirstIterator.h | |
parent | 199ba42cbf56b2fc9c708edb4f08f97dd99ddd49 (diff) | |
download | external_llvm-f0891be8bdbeeadb39da5575273b6645755fa383.zip external_llvm-f0891be8bdbeeadb39da5575273b6645755fa383.tar.gz external_llvm-f0891be8bdbeeadb39da5575273b6645755fa383.tar.bz2 |
Clean up the minor mess I caused with removing iterator.h. I shall take care of 80-col violations and the FIXME later. (Thanks goodness that I live in another continent, so the monkeypox did not strike me :-)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80224 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/ADT/DepthFirstIterator.h')
-rw-r--r-- | include/llvm/ADT/DepthFirstIterator.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/llvm/ADT/DepthFirstIterator.h b/include/llvm/ADT/DepthFirstIterator.h index c5f246c..5f2df2a 100644 --- a/include/llvm/ADT/DepthFirstIterator.h +++ b/include/llvm/ADT/DepthFirstIterator.h @@ -34,7 +34,6 @@ #define LLVM_ADT_DEPTHFIRSTITERATOR_H #include "llvm/ADT/GraphTraits.h" -#include "llvm/ADT/iterator.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/PointerIntPair.h" #include <set> @@ -63,9 +62,11 @@ public: template<class GraphT, class SetType = llvm::SmallPtrSet<typename GraphTraits<GraphT>::NodeType*, 8>, bool ExtStorage = false, class GT = GraphTraits<GraphT> > -class df_iterator : public forward_iterator<typename GT::NodeType, ptrdiff_t>, +class df_iterator : public std::iterator<std::forward_iterator_tag, + typename GT::NodeType, ptrdiff_t>, public df_iterator_storage<SetType, ExtStorage> { - typedef forward_iterator<typename GT::NodeType, ptrdiff_t> super; + typedef std::iterator<std::forward_iterator_tag, + typename GT::NodeType, ptrdiff_t> super; typedef typename GT::NodeType NodeType; typedef typename GT::ChildIteratorType ChildItTy; |