summaryrefslogtreecommitdiffstats
path: root/libcxx
diff options
context:
space:
mode:
authorMarshall Clow <mclow@qualcomm.com>2013-01-03 03:57:56 +0000
committerMarshall Clow <mclow@qualcomm.com>2013-01-03 03:57:56 +0000
commitf941359201c7370d00ff0e8804f52fb5e0926673 (patch)
treebfdbbd2d577e825fb8015904d67eb58d63d8a202 /libcxx
parent600361b3c1cec5aa6eff0e36e001fe6eb7d99235 (diff)
downloadbcm5719-llvm-f941359201c7370d00ff0e8804f52fb5e0926673.tar.gz
bcm5719-llvm-f941359201c7370d00ff0e8804f52fb5e0926673.zip
Removed another copy of 'iterators.h' files in libcxx/test
llvm-svn: 171456
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/test/localization/iterators.h278
-rw-r--r--libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp2
-rw-r--r--libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp2
59 files changed, 58 insertions, 336 deletions
diff --git a/libcxx/test/localization/iterators.h b/libcxx/test/localization/iterators.h
deleted file mode 100644
index 167ed0bb63b..00000000000
--- a/libcxx/test/localization/iterators.h
+++ /dev/null
@@ -1,278 +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_;}
-
- output_iterator () {}
- 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 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/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
index c4337844325..49448d54e08 100644
--- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
index b71d0919d49..6d32770f212 100644
--- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
index f135bdd53fa..c33e51c2430 100644
--- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
index 3c6f84aa4c7..3b342de4954 100644
--- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
index 4c75b08bd4c..a6efb9c9cad 100644
--- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
index a96ad89578e..4c58309c0e6 100644
--- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
index 0f92975b088..b8434cd57a8 100644
--- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
index ca9adbdc589..76c33ea566c 100644
--- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
index 8a1304eb14c..84c1fef8a08 100644
--- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
index 890843b03f3..27e9de61bbf 100644
--- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <streambuf>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
index 6b15e6c5e93..897f76424db 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
@@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
index d3d63410725..4020e0b3832 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
@@ -18,7 +18,7 @@
#include <cassert>
#include <streambuf>
#include <cmath>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
index f6a5368fa04..9325f02ab5b 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
@@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
index dc3624c8b68..21287cdf471 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
@@ -18,7 +18,7 @@
#include <cassert>
#include <streambuf>
#include <cmath>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
index 4f1f353a506..9c7e4d1d4c8 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
@@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
index 47207e6a11c..fa925d00d28 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
@@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
index c5503f675a2..8b330c2489f 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
@@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
index dce04d035d2..9826f936a0f 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
@@ -17,7 +17,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_put<char, output_iterator<char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
index 849d71d84db..e41fdc7da8c 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
index cdf512ad6b2..8773b292f3e 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include <streambuf>
#include <cmath>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../hexfloat.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
index 26736d4a4b6..768d0463ed8 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include <streambuf>
#include <cmath>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../hexfloat.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
index 861f78758f5..6f06a9f77c2 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
index 5c2711bbe2e..5525ce15a2d 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
@@ -19,7 +19,7 @@
#include <cassert>
#include <streambuf>
#include <cmath>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
#include "../../../../../hexfloat.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
index 6182a8f7afc..c0b5d2a8806 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
index 77203969cf6..f75fbbc971e 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
index 3b2ef52c56a..1124e222f11 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
index a97cb0f7d21..c234f8b09f3 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
index 7fb9b9dd833..1f353af0d48 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
index fffbf5b0cf6..1438bceb9dc 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
@@ -18,7 +18,7 @@
#include <ios>
#include <cassert>
#include <streambuf>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::num_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
index 9d1b46d204b..b99bfa734c2 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
@@ -15,7 +15,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
index e52dacdc16e..011aefebf7f 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
@@ -15,7 +15,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
index c7cc225d6e8..e1dc1842c04 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
index e9b4bfe53a8..bb8400a769e 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
index e29e857a22e..1d5794fbc06 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
index be57cd15eb6..6d8cb1c57f5 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
index d1958c31116..51b17b37ca5 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
index c2b0f8b1b64..a23869ea582 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
index 4a55cbef4ee..f23b737168e 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
index d2d3f4e7553..5035519e28a 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
index faf2aa86e12..2ecdd0d562f 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
index 7d9fb227d83..deee27ecda3 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
index 34eb1ef0c87..a7d0e8f49a7 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
index 83d26938ae1..81eb3b2a83a 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
index 077f7a89b65..64de281db5c 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
@@ -15,7 +15,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::time_get<char, input_iterator<const char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
index 7d7e9e39657..25fb8f398e5 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const char*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
index 5daeac94861..89a9ac79f5b 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
index c5da966d720..fa3f4d996c1 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const char*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
index e023c917e54..8055544341b 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const char*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
index 610a60c9d6e..3baa47a0079 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
index 0649be5987c..6bca2670bba 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const char*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
index 52fd6936b5b..d7b6f4776a3 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const char*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
index 1c3617944cd..85ef7c7afdb 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
index 2cf78feec25..2ddcef7c30c 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const char*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
index 0f11131e3a8..dfce7e9e4f7 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
@@ -17,7 +17,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const wchar_t*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
index 7a6753adf97..f8a5fb97d10 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef input_iterator<const char*> I;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
index 585f8f22c5e..2d07b4a0111 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
@@ -23,7 +23,7 @@
#include <locale>
#include <cassert>
-#include "../../../iterators.h"
+#include "../../../../iterators.h"
#include "../../../../platform_support.h" // locale name macros
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
index bfd938ea965..bd3133088b6 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::time_put<char, output_iterator<char*> > F;
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
index 2b119bd964f..3e6d0670cd1 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
@@ -16,7 +16,7 @@
#include <locale>
#include <cassert>
-#include "../../../../iterators.h"
+#include "../../../../../iterators.h"
typedef std::time_put<char, output_iterator<char*> > F;
OpenPOWER on IntegriCloud