Use the new include/Support/iterator file

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3062 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-07-24 22:07:42 +00:00
parent dd39be6c96
commit 0d219edad2
2 changed files with 6 additions and 16 deletions

View File

@ -32,8 +32,8 @@
#define INCLUDED_SUPPORT_ILIST
#include <assert.h>
#include <iterator>
#include <algorithm>
#include <Support/iterator>
template<typename NodeTy, typename Traits> class iplist;
template<typename NodeTy> class ilist_iterator;
@ -71,14 +71,9 @@ struct ilist_traits<const Ty> : public ilist_traits<Ty> {};
//
template<typename NodeTy>
class ilist_iterator
#if __GNUC__ == 3
: public std::iterator<std::bidirectional_iterator_tag, NodeTy> {
typedef std::iterator<std::bidirectional_iterator_tag, NodeTy> super;
#else
: public std::bidirectional_iterator<NodeTy, ptrdiff_t> {
typedef std::bidirectional_iterator<NodeTy, ptrdiff_t> super;
#endif
: public bidirectional_iterator<NodeTy, ptrdiff_t> {
typedef ilist_traits<NodeTy> Traits;
typedef bidirectional_iterator<NodeTy, ptrdiff_t> super;
typedef typename super::pointer pointer;
typedef typename super::reference reference;

View File

@ -32,8 +32,8 @@
#define INCLUDED_SUPPORT_ILIST
#include <assert.h>
#include <iterator>
#include <algorithm>
#include <Support/iterator>
template<typename NodeTy, typename Traits> class iplist;
template<typename NodeTy> class ilist_iterator;
@ -71,14 +71,9 @@ struct ilist_traits<const Ty> : public ilist_traits<Ty> {};
//
template<typename NodeTy>
class ilist_iterator
#if __GNUC__ == 3
: public std::iterator<std::bidirectional_iterator_tag, NodeTy> {
typedef std::iterator<std::bidirectional_iterator_tag, NodeTy> super;
#else
: public std::bidirectional_iterator<NodeTy, ptrdiff_t> {
typedef std::bidirectional_iterator<NodeTy, ptrdiff_t> super;
#endif
: public bidirectional_iterator<NodeTy, ptrdiff_t> {
typedef ilist_traits<NodeTy> Traits;
typedef bidirectional_iterator<NodeTy, ptrdiff_t> super;
typedef typename super::pointer pointer;
typedef typename super::reference reference;