diff options
| -rw-r--r-- | include/Support/ilist | 11 | ||||
| -rw-r--r-- | include/llvm/ADT/ilist | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/include/Support/ilist b/include/Support/ilist index 09c951c..a5c5c6b 100644 --- a/include/Support/ilist +++ b/include/Support/ilist @@ -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; diff --git a/include/llvm/ADT/ilist b/include/llvm/ADT/ilist index 09c951c..a5c5c6b 100644 --- a/include/llvm/ADT/ilist +++ b/include/llvm/ADT/ilist @@ -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; |