Removed several more different 'iterators.h' files in libcxx/test

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@171452 91177308-0d34-0410-b5e6-96231b3b80d8

test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp

@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp

@@ -17,7 +17,7 @@
 #include <map>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/associative/multiset/insert_iter_iter.pass.cpp

@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 int main()
 {

test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp

@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp

@@ -18,7 +18,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
 

test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp

@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 
 int main()

test/containers/associative/set/insert_iter_iter.pass.cpp

@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 int main()
 {

test/containers/associative/set/set.cons/iter_iter.pass.cpp

@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp

@@ -18,7 +18,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_allocator.h"
 

test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp

@@ -17,7 +17,7 @@
 #include <set>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 
 int main()

test/containers/iterators.h

@@ -1,251 +0,0 @@
-#ifndef ITERATORS_H
-#define ITERATORS_H
-
-#include <iterator>
-
-template <class It>
-class input_iterator
-{
-    It it_;
-
-    template <class U> friend class input_iterator;
-public:
-    typedef          std::input_iterator_tag                   iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    input_iterator() : it_() {}
-    explicit input_iterator(It it) : it_(it) {}
-    template <class U>
-        input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer operator->() const {return it_;}
-
-    input_iterator& operator++() {++it_; return *this;}
-    input_iterator operator++(int)
-        {input_iterator tmp(*this); ++(*this); return tmp;}
-
-    friend bool operator==(const input_iterator& x, const input_iterator& y)
-        {return x.it_ == y.it_;}
-    friend bool operator!=(const input_iterator& x, const input_iterator& y)
-        {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const input_iterator<T>& x, const input_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-template <class It>
-class forward_iterator
-{
-    It it_;
-
-    template <class U> friend class forward_iterator;
-public:
-    typedef          std::forward_iterator_tag                 iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    forward_iterator() : it_() {}
-    explicit forward_iterator(It it) : it_(it) {}
-    template <class U>
-        forward_iterator(const forward_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer operator->() const {return it_;}
-
-    forward_iterator& operator++() {++it_; return *this;}
-    forward_iterator operator++(int)
-        {forward_iterator tmp(*this); ++(*this); return tmp;}
-
-    friend bool operator==(const forward_iterator& x, const forward_iterator& y)
-        {return x.it_ == y.it_;}
-    friend bool operator!=(const forward_iterator& x, const forward_iterator& y)
-        {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-template <class It>
-class bidirectional_iterator
-{
-    It it_;
-
-    template <class U> friend class bidirectional_iterator;
-public:
-    typedef          std::bidirectional_iterator_tag           iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    bidirectional_iterator() : it_() {}
-    explicit bidirectional_iterator(It it) : it_(it) {}
-    template <class U>
-        bidirectional_iterator(const bidirectional_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer operator->() const {return it_;}
-
-    bidirectional_iterator& operator++() {++it_; return *this;}
-    bidirectional_iterator operator++(int)
-        {bidirectional_iterator tmp(*this); ++(*this); return tmp;}
-
-    bidirectional_iterator& operator--() {--it_; return *this;}
-    bidirectional_iterator operator--(int)
-        {bidirectional_iterator tmp(*this); --(*this); return tmp;}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-template <class It>
-class random_access_iterator
-{
-    It it_;
-
-    template <class U> friend class random_access_iterator;
-public:
-    typedef          std::random_access_iterator_tag           iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    random_access_iterator() : it_() {}
-    explicit random_access_iterator(It it) : it_(it) {}
-   template <class U>
-        random_access_iterator(const random_access_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer operator->() const {return it_;}
-
-    random_access_iterator& operator++() {++it_; return *this;}
-    random_access_iterator operator++(int)
-        {random_access_iterator tmp(*this); ++(*this); return tmp;}
-
-    random_access_iterator& operator--() {--it_; return *this;}
-    random_access_iterator operator--(int)
-        {random_access_iterator tmp(*this); --(*this); return tmp;}
-
-    random_access_iterator& operator+=(difference_type n) {it_ += n; return *this;}
-    random_access_iterator operator+(difference_type n) const
-        {random_access_iterator tmp(*this); tmp += n; return tmp;}
-    friend random_access_iterator operator+(difference_type n, random_access_iterator x)
-        {x += n; return x;}
-    random_access_iterator& operator-=(difference_type n) {return *this += -n;}
-    random_access_iterator operator-(difference_type n) const
-        {random_access_iterator tmp(*this); tmp -= n; return tmp;}
-
-    reference operator[](difference_type n) const {return it_[n];}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-template <class T, class U>
-inline
-bool
-operator<(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return x.base() < y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator<=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return !(y < x);
-}
-
-template <class T, class U>
-inline
-bool
-operator>(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return y < x;
-}
-
-template <class T, class U>
-inline
-bool
-operator>=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return !(x < y);
-}
-
-template <class T, class U>
-inline
-typename std::iterator_traits<T>::difference_type
-operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return x.base() - y.base();
-}
-
-#endif  // ITERATORS_H

test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp

@@ -15,7 +15,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )

test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp

@@ -14,7 +14,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )

test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp

@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "../../../stack_allocator.h"
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 template <class InputIterator>
 void

test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp

@@ -15,7 +15,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_allocator.h"
 
 template <class InputIterator, class Allocator>

test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp

@@ -15,7 +15,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../MoveOnly.h"
 #include "../../../stack_allocator.h"
 

test/containers/sequences/deque/deque.special/copy.pass.cpp

@@ -18,7 +18,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )

test/containers/sequences/deque/deque.special/copy_backward.pass.cpp

@@ -18,7 +18,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )

test/containers/sequences/deque/deque.special/move.pass.cpp

@@ -18,7 +18,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )

test/containers/sequences/deque/deque.special/move_backward.pass.cpp

@@ -18,7 +18,7 @@
 #include <deque>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 std::deque<int>
 make(int size, int start = 0 )

test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp

@@ -16,7 +16,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp

@@ -16,7 +16,7 @@
 #include <cassert>
 #include <iterator>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp

@@ -18,7 +18,7 @@
 #include <iterator>
 
 #include "../../../test_allocator.h"
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp

@@ -16,7 +16,7 @@
 #include <forward_list>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/sequences/list/list.cons/input_iterator.pass.cpp

@@ -14,7 +14,7 @@
 
 #include <list>
 #include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../stack_allocator.h"
 
 int main()

test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp

@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 template <class C, class Iterator>
 void

test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp

@@ -16,7 +16,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 template <class C, class Iterator>
 void

test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp

@@ -15,7 +15,7 @@
 
 #include <vector>
 #include <cassert>
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 int main()
 {

test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp

@@ -14,7 +14,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../stack_allocator.h"
 
 template <class C, class Iterator>

test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp

@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../stack_allocator.h"
 
 template <class C, class Iterator>

test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp

@@ -15,7 +15,7 @@
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp

@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"

test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp

@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"

test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp

@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"

test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp

@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"

test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp

@@ -23,7 +23,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"

test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp

@@ -19,7 +19,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp

@@ -20,7 +20,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp

@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"

test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp

@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"

test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp

@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"

test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp

@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"

test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp

@@ -23,7 +23,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../NotConstructible.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"

test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp

@@ -19,7 +19,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp

@@ -20,7 +20,7 @@
 #include <string>
 #include <cassert>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 int main()
 {

test/containers/unord/unord.multiset/insert_init.pass.cpp

@@ -18,7 +18,7 @@
 #include <unordered_set>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 int main()
 {

test/containers/unord/unord.multiset/insert_range.pass.cpp

@@ -19,7 +19,7 @@
 #include <unordered_set>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 int main()
 {

test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp

@@ -20,7 +20,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"

test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp

@@ -20,7 +20,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"

test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp

@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"

test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp

@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"

test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp

@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"

test/containers/unord/unord.set/insert_init.pass.cpp

@@ -18,7 +18,7 @@
 #include <unordered_set>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 int main()
 {

test/containers/unord/unord.set/insert_range.pass.cpp

@@ -19,7 +19,7 @@
 #include <unordered_set>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 int main()
 {

test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp

@@ -20,7 +20,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"

test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp

@@ -20,7 +20,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"

test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp

@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"

test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp

@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"

test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp

@@ -22,7 +22,7 @@
 #include <cassert>
 #include <cfloat>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 #include "../../../test_compare.h"
 #include "../../../test_hash.h"
 #include "../../../test_allocator.h"

test/iterators.h

@@ -18,6 +18,7 @@ public:
 
     It base() const {return it_;}
 
+    output_iterator () {}
     explicit output_iterator(It it) : it_(it) {}
     template <class U>
         output_iterator(const output_iterator<U>& u) :it_(u.it_) {}

test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp

@@ -21,7 +21,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 template <class It>
 void

test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp

@@ -20,7 +20,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 template <class It>
 void

test/iterators/iterator.primitives/iterator.operations/next.pass.cpp

@@ -15,7 +15,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 template <class It>
 void

test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp

@@ -15,7 +15,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../iterators.h"
+#include "../../../iterators.h"
 
 template <class It>
 void

test/iterators/iterators.h

@@ -1,251 +0,0 @@
-#ifndef ITERATORS_H
-#define ITERATORS_H
-
-#include <iterator>
-
-template <class It>
-class input_iterator
-{
-    It it_;
-
-    template <class U> friend class input_iterator;
-public:
-    typedef          std::input_iterator_tag                   iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    input_iterator() : it_() {}
-    explicit input_iterator(It it) : it_(it) {}
-    template <class U>
-        input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer operator->() const {return it_;}
-
-    input_iterator& operator++() {++it_; return *this;}
-    input_iterator operator++(int)
-        {input_iterator tmp(*this); ++(*this); return tmp;}
-
-    friend bool operator==(const input_iterator& x, const input_iterator& y)
-        {return x.it_ == y.it_;}
-    friend bool operator!=(const input_iterator& x, const input_iterator& y)
-        {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const input_iterator<T>& x, const input_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-template <class It>
-class forward_iterator
-{
-    It it_;
-
-    template <class U> friend class forward_iterator;
-public:
-    typedef          std::forward_iterator_tag                 iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    forward_iterator() : it_() {}
-    explicit forward_iterator(It it) : it_(it) {}
-    template <class U>
-        forward_iterator(const forward_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer operator->() const {return it_;}
-
-    forward_iterator& operator++() {++it_; return *this;}
-    forward_iterator operator++(int)
-        {forward_iterator tmp(*this); ++(*this); return tmp;}
-
-    friend bool operator==(const forward_iterator& x, const forward_iterator& y)
-        {return x.it_ == y.it_;}
-    friend bool operator!=(const forward_iterator& x, const forward_iterator& y)
-        {return !(x == y);}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const forward_iterator<T>& x, const forward_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-template <class It>
-class bidirectional_iterator
-{
-    It it_;
-
-    template <class U> friend class bidirectional_iterator;
-public:
-    typedef          std::bidirectional_iterator_tag           iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    bidirectional_iterator() : it_() {}
-    explicit bidirectional_iterator(It it) : it_(it) {}
-    template <class U>
-        bidirectional_iterator(const bidirectional_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer operator->() const {return it_;}
-
-    bidirectional_iterator& operator++() {++it_; return *this;}
-    bidirectional_iterator operator++(int)
-        {bidirectional_iterator tmp(*this); ++(*this); return tmp;}
-
-    bidirectional_iterator& operator--() {--it_; return *this;}
-    bidirectional_iterator operator--(int)
-        {bidirectional_iterator tmp(*this); --(*this); return tmp;}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-template <class It>
-class random_access_iterator
-{
-    It it_;
-
-    template <class U> friend class random_access_iterator;
-public:
-    typedef          std::random_access_iterator_tag           iterator_category;
-    typedef typename std::iterator_traits<It>::value_type      value_type;
-    typedef typename std::iterator_traits<It>::difference_type difference_type;
-    typedef It                                                 pointer;
-    typedef typename std::iterator_traits<It>::reference       reference;
-
-    It base() const {return it_;}
-
-    random_access_iterator() : it_() {}
-    explicit random_access_iterator(It it) : it_(it) {}
-   template <class U>
-        random_access_iterator(const random_access_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-    pointer operator->() const {return it_;}
-
-    random_access_iterator& operator++() {++it_; return *this;}
-    random_access_iterator operator++(int)
-        {random_access_iterator tmp(*this); ++(*this); return tmp;}
-
-    random_access_iterator& operator--() {--it_; return *this;}
-    random_access_iterator operator--(int)
-        {random_access_iterator tmp(*this); --(*this); return tmp;}
-
-    random_access_iterator& operator+=(difference_type n) {it_ += n; return *this;}
-    random_access_iterator operator+(difference_type n) const
-        {random_access_iterator tmp(*this); tmp += n; return tmp;}
-    friend random_access_iterator operator+(difference_type n, random_access_iterator x)
-        {x += n; return x;}
-    random_access_iterator& operator-=(difference_type n) {return *this += -n;}
-    random_access_iterator operator-(difference_type n) const
-        {random_access_iterator tmp(*this); tmp -= n; return tmp;}
-
-    reference operator[](difference_type n) const {return it_[n];}
-};
-
-template <class T, class U>
-inline
-bool
-operator==(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return x.base() == y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator!=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return !(x == y);
-}
-
-template <class T, class U>
-inline
-bool
-operator<(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return x.base() < y.base();
-}
-
-template <class T, class U>
-inline
-bool
-operator<=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return !(y < x);
-}
-
-template <class T, class U>
-inline
-bool
-operator>(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return y < x;
-}
-
-template <class T, class U>
-inline
-bool
-operator>=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return !(x < y);
-}
-
-template <class T, class U>
-inline
-typename std::iterator_traits<T>::difference_type
-operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
-{
-    return x.base() - y.base();
-}
-
-#endif  // ITERATORS_H

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp

@@ -18,7 +18,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp

@@ -20,7 +20,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp

@@ -18,7 +18,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp

@@ -17,7 +17,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp

@@ -17,7 +17,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp

@@ -17,7 +17,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp

@@ -17,7 +17,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp

@@ -19,7 +19,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp

@@ -19,7 +19,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp

@@ -19,7 +19,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp

@@ -19,7 +19,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp

@@ -19,7 +19,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp

@@ -19,7 +19,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp

@@ -18,7 +18,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It, class U>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp

@@ -15,7 +15,7 @@
 
 #include <iterator>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp

@@ -16,7 +16,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp

@@ -16,7 +16,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp

@@ -16,7 +16,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp

@@ -16,7 +16,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp

@@ -16,7 +16,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp

@@ -20,7 +20,7 @@
 #include <memory>
 #endif
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp

@@ -19,7 +19,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It, class U>
 void

test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp

@@ -26,7 +26,7 @@
 #include <iterator>
 #include <type_traits>
 
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp

@@ -15,7 +15,7 @@
 
 #include <iterator>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp

@@ -16,7 +16,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp

@@ -18,7 +18,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It, class U>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp

@@ -19,7 +19,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp

@@ -16,7 +16,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp

@@ -16,7 +16,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp

@@ -17,7 +17,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp

@@ -17,7 +17,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp

@@ -16,7 +16,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp

@@ -16,7 +16,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp

@@ -17,7 +17,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void

test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp

@@ -17,7 +17,7 @@
 #include <iterator>
 #include <cassert>
 
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
 
 template <class It>
 void