...and then there was one. Only one copy of 'iterators.h' in the test tree for libc++

llvm-svn: 171479

10 files changed, 9 insertions, 323 deletions

diff --git a/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp b/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp
index a3a03b58a75..d6b303bb697 100644
--- a/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp
@@ -18,7 +18,7 @@
 #include <numeric>
 #include <cassert>
 
-#include "../iterators.h"
+#include "../../../iterators.h"
 
 template <class Iter, class T>
 void
diff --git a/libcxx/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp b/libcxx/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
index b7ed40f2fe2..53f460b25a9 100644
--- a/libcxx/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
@@ -20,7 +20,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../iterators.h"
+#include "../../../iterators.h"
 
 template <class Iter, class T>
 void
diff --git a/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp b/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
index 36bda6c0344..7eccaeb9c5d 100644
--- a/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
@@ -22,7 +22,7 @@
 #include <numeric>
 #include <cassert>
 
-#include "../iterators.h"
+#include "../../../iterators.h"
 
 template <class InIter, class OutIter>
 void
diff --git a/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp b/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
index f5a61244f11..bba7161bc17 100644
--- a/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
@@ -23,7 +23,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../iterators.h"
+#include "../../../iterators.h"
 
 template <class InIter, class OutIter>
 void
diff --git a/libcxx/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp b/libcxx/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp
index 06df32d6c4d..d23af2f011f 100644
--- a/libcxx/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp
@@ -22,7 +22,7 @@
 #include <numeric>
 #include <cassert>
 
-#include "../iterators.h"
+#include "../../../iterators.h"
 
 template <class Iter1, class Iter2, class T>
 void
diff --git a/libcxx/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp b/libcxx/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
index f720bb6f386..cf6f9c4aee0 100644
--- a/libcxx/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
@@ -24,7 +24,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../iterators.h"
+#include "../../../iterators.h"
 
 template <class Iter1, class Iter2, class T>
 void
diff --git a/libcxx/test/numerics/numeric.ops/iterators.h b/libcxx/test/numerics/numeric.ops/iterators.h
deleted file mode 100644
index 539a9a49848..00000000000
--- a/libcxx/test/numerics/numeric.ops/iterators.h
+++ /dev/null
@@ -1,314 +0,0 @@
-#ifndef ITERATORS_H
-#define ITERATORS_H
-
-#include <iterator>
-
-template <class It>
-class output_iterator
-{
-    It it_;
-
-    template <class U> friend class output_iterator;
-public:
-    typedef          std::output_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_;}
-
-    explicit output_iterator(It it) : it_(it) {}
-    template <class U>
-        output_iterator(const output_iterator<U>& u) :it_(u.it_) {}
-
-    reference operator*() const {return *it_;}
-
-    output_iterator& operator++() {++it_; return *this;}
-    output_iterator operator++(int)
-        {output_iterator tmp(*this); ++(*this); return tmp;}
-};
-
-template <class Iter>
-inline
-Iter
-base(output_iterator<Iter> i)
-{
-    return i.base();
-}
-
-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_;}
-
-    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;}
-};
-
-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 Iter>
-inline
-Iter
-base(input_iterator<Iter> i)
-{
-    return i.base();
-}
-
-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;}
-};
-
-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 Iter>
-inline
-Iter
-base(forward_iterator<Iter> i)
-{
-    return i.base();
-}
-
-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 Iter>
-inline
-Iter
-base(bidirectional_iterator<Iter> i)
-{
-    return i.base();
-}
-
-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();
-}
-
-template <class Iter>
-inline
-Iter
-base(random_access_iterator<Iter> i)
-{
-    return i.base();
-}
-
-template <class Iter>
-inline
-Iter
-base(Iter i)
-{
-    return i;
-}
-
-#endif  // ITERATORS_H
diff --git a/libcxx/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp b/libcxx/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp
index d165b11b9e9..84f78301e1a 100644
--- a/libcxx/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp
@@ -15,7 +15,7 @@
 #include <numeric>
 #include <cassert>
 
-#include "../iterators.h"
+#include "../../../iterators.h"
 
 template <class InIter>
 void
diff --git a/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp b/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
index 6fb4c09fe53..5d990a235bd 100644
--- a/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
@@ -20,7 +20,7 @@
 #include <numeric>
 #include <cassert>
 
-#include "../iterators.h"
+#include "../../../iterators.h"
 
 template <class InIter, class OutIter>
 void
diff --git a/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp b/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
index c0f83bf91a9..3c3f403f4a3 100644
--- a/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
@@ -22,7 +22,7 @@
 #include <functional>
 #include <cassert>
 
-#include "../iterators.h"
+#include "../../../iterators.h"
 
 template <class InIter, class OutIter>
 void