diff options
| author | Marshall Clow <mclow@qualcomm.com> | 2013-01-03 02:29:29 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow@qualcomm.com> | 2013-01-03 02:29:29 +0000 |
| commit | cf1589f74950be0d49543224e89087f37012036c (patch) | |
| tree | aac212f987ec7bebdd63ebff2afee17f1835b0fd /libcxx/test/iterators | |
| parent | 59095f1cf9efe344485bbb0a0ee3aae45617f994 (diff) | |
| download | bcm5719-llvm-cf1589f74950be0d49543224e89087f37012036c.tar.gz bcm5719-llvm-cf1589f74950be0d49543224e89087f37012036c.zip | |
Removed several more different 'iterators.h' files in libcxx/test
llvm-svn: 171452
Diffstat (limited to 'libcxx/test/iterators')
50 files changed, 49 insertions, 300 deletions
diff --git a/libcxx/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp b/libcxx/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp index 73a0fe90ec5..db3dcc15760 100644 --- a/libcxx/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp b/libcxx/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp index be3dcf48b4c..aaea842a15e 100644 --- a/libcxx/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp b/libcxx/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp index 2b81fe535d6..6d99ed2b4b7 100644 --- a/libcxx/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp b/libcxx/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp index 1c58b06db07..44ceb007fdb 100644 --- a/libcxx/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/iterators.h b/libcxx/test/iterators/iterators.h deleted file mode 100644 index bbdeede9ff8..00000000000 --- a/libcxx/test/iterators/iterators.h +++ /dev/null @@ -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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp index e494a76473e..6990459bd91 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp index 5f6b9569749..62938c9465d 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp index 55d44acc1d0..ff975f6c670 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp index 528e1211e7e..794fb970cc3 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp index 2275f5c8cb5..6b6a8991131 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp index 1f655701aff..5ed8e8c5baf 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp index e9b6278d1aa..f5439bea095 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp index 5c5fc8edf10..bc1b48bc945 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp index 1412550532b..1af51a1bd88 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp index 7e7990334b8..e4c942158ee 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp index d3e0f729c8a..d0d1e889042 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp index c6e121ecc5e..6dfecdab303 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp index 7e6d48c0bfa..3f1e517dc40 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp index 35b110d373e..9a5e0553f97 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp index 78bcc4bd1a7..30e4e14dcd3 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp index 95e86679c8a..ef37caf4a81 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp index 7f502361e5c..bb1ddb3d6d6 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp index f9b0f08f545..a6ea855cc14 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp index 23080796f88..8ef9305d084 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp index 16f38f4749a..4fae863af6c 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp index 9d0be23c8bf..064d95eb677 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp index 371b32c8093..262b2d521b2 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp index e36dcccdfc6..62398aa0d8f 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp index c432299cc19..a809273695e 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp index eb87fda64a5..899c54ad060 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp index 58f94905345..383200a6faa 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp index 8cc400ad8b5..6bf2db7763a 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp index 095f42044ed..74cc1a53b9c 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp index 8b3fb62e87a..fed4fb3a5ad 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp index 73bd339629d..c823f1012a1 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp index 11386e622ee..69f26e2fc7f 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp index b4d24dde556..b8ec2cb564d 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp index a4c5b95dd6d..6292292e2ab 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp index 627f03d8824..29c600f5d88 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp index e3b5ae99e6f..ab34c31e00a 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp index d6bf6f3abdb..3d4b4161fb7 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../iterators.h" +#include "../../../../../iterators.h" template <class It, class U> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp index a1534920cd5..85b589f40c3 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp +++ b/libcxx/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 diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp index 448e6746bf1..3b878ec54e7 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp @@ -20,7 +20,7 @@ #include <cstddef> #include <cassert> -#include "../../../../iterators.h" +#include "../../../../../iterators.h" template <class It1, class It2> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp index a3d95573658..18ce7bafdb0 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../iterators.h" +#include "../../../../../iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp index 9eaaf661fc0..7732a3ae9e2 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../iterators.h" +#include "../../../../../iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp index 084062a3cbb..9296c2bde06 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../../../iterators.h" +#include "../../../../../iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp index 98810afe863..fb91b060be1 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../iterators.h" +#include "../../../../../iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp index e45fba0a035..0331f02605f 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../iterators.h" +#include "../../../../../iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp index 93656946e55..46720b8b913 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp @@ -18,7 +18,7 @@ #include <iterator> #include <cassert> -#include "../../../../iterators.h" +#include "../../../../../iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp index 196feecaf89..5bff9806c49 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp @@ -28,7 +28,7 @@ #include <iterator> #include <type_traits> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class It> struct find_current |
