diff options
Diffstat (limited to 'libcxx/test/strings')
168 files changed, 167 insertions, 419 deletions
diff --git a/libcxx/test/strings/basic.string/min_allocator.h b/libcxx/test/strings/basic.string/min_allocator.h deleted file mode 100644 index c0d28e5faa2..00000000000 --- a/libcxx/test/strings/basic.string/min_allocator.h +++ /dev/null @@ -1,252 +0,0 @@ -#ifndef MIN_ALLOCATOR_H -#define MIN_ALLOCATOR_H - -#if __cplusplus >= 201103L - -#include <memory> - -template <class T> class min_pointer; -template <class T> class min_pointer<const T>; -template <> class min_pointer<void>; -template <> class min_pointer<const void>; -template <class T> class min_allocator; - -template <> -class min_pointer<const void> -{ - const void* ptr_; -public: - min_pointer() noexcept = default; - min_pointer(std::nullptr_t) : ptr_(nullptr) {} - template <class T> - min_pointer(min_pointer<T> p) : ptr_(p.ptr_) {} - - explicit operator bool() const {return ptr_ != nullptr;} - - friend bool operator==(min_pointer x, min_pointer y) {return x.ptr_ == y.ptr_;} - friend bool operator!=(min_pointer x, min_pointer y) {return !(x == y);} - template <class U> friend class min_pointer; -}; - -template <> -class min_pointer<void> -{ - void* ptr_; -public: - min_pointer() noexcept = default; - min_pointer(std::nullptr_t) : ptr_(nullptr) {} - template <class T, - class = typename std::enable_if - < - !std::is_const<T>::value - >::type - > - min_pointer(min_pointer<T> p) : ptr_(p.ptr_) {} - - explicit operator bool() const {return ptr_ != nullptr;} - - friend bool operator==(min_pointer x, min_pointer y) {return x.ptr_ == y.ptr_;} - friend bool operator!=(min_pointer x, min_pointer y) {return !(x == y);} - template <class U> friend class min_pointer; -}; - -template <class T> -class min_pointer -{ - T* ptr_; - - explicit min_pointer(T* p) : ptr_(p) {} -public: - min_pointer() noexcept = default; - min_pointer(std::nullptr_t) : ptr_(nullptr) {} - explicit min_pointer(min_pointer<void> p) : ptr_(static_cast<T*>(p.ptr_)) {} - - explicit operator bool() const {return ptr_ != nullptr;} - - typedef std::ptrdiff_t difference_type; - typedef T& reference; - typedef T* pointer; - typedef T value_type; - typedef std::random_access_iterator_tag iterator_category; - - reference operator*() const {return *ptr_;} - pointer operator->() const {return ptr_;} - - min_pointer& operator++() {++ptr_; return *this;} - min_pointer operator++(int) {min_pointer tmp(*this); ++ptr_; return tmp;} - - min_pointer& operator--() {--ptr_; return *this;} - min_pointer operator--(int) {min_pointer tmp(*this); --ptr_; return tmp;} - - min_pointer& operator+=(difference_type n) {ptr_ += n; return *this;} - min_pointer& operator-=(difference_type n) {ptr_ -= n; return *this;} - - min_pointer operator+(difference_type n) const - { - min_pointer tmp(*this); - tmp += n; - return tmp; - } - - friend min_pointer operator+(difference_type n, min_pointer x) - { - return x + n; - } - - min_pointer operator-(difference_type n) const - { - min_pointer tmp(*this); - tmp -= n; - return tmp; - } - - friend difference_type operator-(min_pointer x, min_pointer y) - { - return x.ptr_ - y.ptr_; - } - - reference operator[](difference_type n) const {return ptr_[n];} - - friend bool operator< (min_pointer x, min_pointer y) {return x.ptr_ < y.ptr_;} - friend bool operator> (min_pointer x, min_pointer y) {return y < x;} - friend bool operator<=(min_pointer x, min_pointer y) {return !(y < x);} - friend bool operator>=(min_pointer x, min_pointer y) {return !(x < y);} - - static min_pointer pointer_to(T& t) {return min_pointer(std::addressof(t));} - - friend bool operator==(min_pointer x, min_pointer y) {return x.ptr_ == y.ptr_;} - friend bool operator!=(min_pointer x, min_pointer y) {return !(x == y);} - template <class U> friend class min_pointer; - template <class U> friend class min_allocator; -}; - -template <class T> -class min_pointer<const T> -{ - const T* ptr_; - - explicit min_pointer(const T* p) : ptr_(p) {} -public: - min_pointer() noexcept = default; - min_pointer(std::nullptr_t) : ptr_(nullptr) {} - min_pointer(min_pointer<T> p) : ptr_(p.ptr_) {} - explicit min_pointer(min_pointer<const void> p) : ptr_(static_cast<const T*>(p.ptr_)) {} - - explicit operator bool() const {return ptr_ != nullptr;} - - typedef std::ptrdiff_t difference_type; - typedef const T& reference; - typedef const T* pointer; - typedef const T value_type; - typedef std::random_access_iterator_tag iterator_category; - - reference operator*() const {return *ptr_;} - pointer operator->() const {return ptr_;} - - min_pointer& operator++() {++ptr_; return *this;} - min_pointer operator++(int) {min_pointer tmp(*this); ++ptr_; return tmp;} - - min_pointer& operator--() {--ptr_; return *this;} - min_pointer operator--(int) {min_pointer tmp(*this); --ptr_; return tmp;} - - min_pointer& operator+=(difference_type n) {ptr_ += n; return *this;} - min_pointer& operator-=(difference_type n) {ptr_ -= n; return *this;} - - min_pointer operator+(difference_type n) const - { - min_pointer tmp(*this); - tmp += n; - return tmp; - } - - friend min_pointer operator+(difference_type n, min_pointer x) - { - return x + n; - } - - min_pointer operator-(difference_type n) const - { - min_pointer tmp(*this); - tmp -= n; - return tmp; - } - - friend difference_type operator-(min_pointer x, min_pointer y) - { - return x.ptr_ - y.ptr_; - } - - reference operator[](difference_type n) const {return ptr_[n];} - - friend bool operator< (min_pointer x, min_pointer y) {return x.ptr_ < y.ptr_;} - friend bool operator> (min_pointer x, min_pointer y) {return y < x;} - friend bool operator<=(min_pointer x, min_pointer y) {return !(y < x);} - friend bool operator>=(min_pointer x, min_pointer y) {return !(x < y);} - - static min_pointer pointer_to(const T& t) {return min_pointer(std::addressof(t));} - - friend bool operator==(min_pointer x, min_pointer y) {return x.ptr_ == y.ptr_;} - friend bool operator!=(min_pointer x, min_pointer y) {return !(x == y);} - template <class U> friend class min_pointer; -}; - -template <class T> -inline -bool -operator==(min_pointer<T> x, std::nullptr_t) -{ - return !static_cast<bool>(x); -} - -template <class T> -inline -bool -operator==(std::nullptr_t, min_pointer<T> x) -{ - return !static_cast<bool>(x); -} - -template <class T> -inline -bool -operator!=(min_pointer<T> x, std::nullptr_t) -{ - return static_cast<bool>(x); -} - -template <class T> -inline -bool -operator!=(std::nullptr_t, min_pointer<T> x) -{ - return static_cast<bool>(x); -} - -template <class T> -class min_allocator -{ -public: - typedef T value_type; - typedef min_pointer<T> pointer; - - min_allocator() = default; - template <class U> - min_allocator(min_allocator<U>) {} - - pointer allocate(std::ptrdiff_t n) - { - return pointer(static_cast<T*>(::operator new(n*sizeof(T)))); - } - - void deallocate(pointer p, std::ptrdiff_t) - { - return ::operator delete(p.ptr_); - } - - friend bool operator==(min_allocator, min_allocator) {return true;} - friend bool operator!=(min_allocator x, min_allocator y) {return !(x == y);} -}; - -#endif // __cplusplus >= 201103L - -#endif // MIN_ALLOCATOR_H diff --git a/libcxx/test/strings/basic.string/string.access/at.pass.cpp b/libcxx/test/strings/basic.string/string.access/at.pass.cpp index e24b560d3c9..8fada8fb1ee 100644 --- a/libcxx/test/strings/basic.string/string.access/at.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/at.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.access/back.pass.cpp b/libcxx/test/strings/basic.string/string.access/back.pass.cpp index ed0d327f52d..e91521441b8 100644 --- a/libcxx/test/strings/basic.string/string.access/back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/back.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp index b153249a717..2b31fabc7c7 100644 --- a/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp index ece27a6d654..7feb4239f07 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp index d36885e36b7..9f7785b85cd 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp index 385c2197000..6294200104b 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp index 15985facac1..ff675bc5c21 100644 --- a/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp index 82b11904369..b20e2018802 100644 --- a/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/front.pass.cpp b/libcxx/test/strings/basic.string/string.access/front.pass.cpp index 807e936ab15..ed80916f16f 100644 --- a/libcxx/test/strings/basic.string/string.access/front.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/front.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.access/index.pass.cpp b/libcxx/test/strings/basic.string/string.access/index.pass.cpp index 567eeee05ba..cd316238516 100644 --- a/libcxx/test/strings/basic.string/string.access/index.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/index.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp index 22ca1f3be14..4a447d5a8f0 100644 --- a/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/clear.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/clear.pass.cpp index ba8ba245d29..b73af759934 100644 --- a/libcxx/test/strings/basic.string/string.capacity/clear.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/clear.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/empty.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/empty.pass.cpp index 29f62cdf76b..ac65f514485 100644 --- a/libcxx/test/strings/basic.string/string.capacity/empty.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/empty.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/length.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/length.pass.cpp index 5ddb5c1e0cc..d3ae1aaee03 100644 --- a/libcxx/test/strings/basic.string/string.capacity/length.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/length.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/max_size.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/max_size.pass.cpp index 0fe7f123c89..e6a3aa42dde 100644 --- a/libcxx/test/strings/basic.string/string.capacity/max_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/max_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/reserve.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/reserve.pass.cpp index 6fdb457e3f8..a155825be75 100644 --- a/libcxx/test/strings/basic.string/string.capacity/reserve.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/reserve.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/resize_size.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/resize_size.pass.cpp index d1b66a41bab..14fe209fd59 100644 --- a/libcxx/test/strings/basic.string/string.capacity/resize_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/resize_size.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp index 9fb0c8cc7a6..f293df971f2 100644 --- a/libcxx/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp index 310cceca45e..aacbffd098f 100644 --- a/libcxx/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/size.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/size.pass.cpp index 9d51ca1705a..21b475a8113 100644 --- a/libcxx/test/strings/basic.string/string.capacity/size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp index 3a8c571344f..b15b56977ec 100644 --- a/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/char_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/char_assignment.pass.cpp index 4d750d8555c..1c582bc5163 100644 --- a/libcxx/test/strings/basic.string/string.cons/char_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/char_assignment.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp index 3ebb22862dc..fb6001f85b6 100644 --- a/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp index 693ecf38b77..d18241e565a 100644 --- a/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp index 10c49e55fff..ccb6c599974 100644 --- a/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp index 7654901b851..60e62cc288c 100644 --- a/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp index 6bbf51a8805..75307689535 100644 --- a/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp index ebd0974cd72..11f2b43c4ca 100644 --- a/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp @@ -19,7 +19,7 @@ #include "../test_allocator.h" #include "../input_iterator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class It> void diff --git a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp index ba68087aa5d..873e8891094 100644 --- a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp @@ -17,7 +17,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp index 80aadcb355a..1f0d5cd7ca7 100644 --- a/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp @@ -17,7 +17,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp index 3e6626b60eb..60de3b029bf 100644 --- a/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp @@ -18,7 +18,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp index befb143d973..8aa88c9fe72 100644 --- a/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class charT> void diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp index d035837cd97..c691613379a 100644 --- a/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp index dbfcec7e33e..629e2967b25 100644 --- a/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class charT> void diff --git a/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp index a427d72ba8f..a8e6fdf24f0 100644 --- a/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class charT> void diff --git a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp index 16072111c89..3e04a97bdcc 100644 --- a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp index fddd6e675bb..55f2eb30f80 100644 --- a/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp index 9a9f042d428..d0c6ddbb950 100644 --- a/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp index cca6ff622d7..6b86d263245 100644 --- a/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp index dbff2a57899..6f29f433f31 100644 --- a/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp index 109c583f070..1fb422c080a 100644 --- a/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp index d9011f523cc..6cac1875ce8 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp index 3773dba3566..d90387e3a46 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp index f82349a4e1d..c4a2d0a4baf 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp index 8324c873ccc..ce44cb1ba5b 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp index fff3907ab78..8fab8babc61 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp index c36644ba2c0..d1cac07e222 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp index d2b779b47aa..914c77d48c5 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp index b3732da3e24..02180bbd73d 100644 --- a/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp index edb02d719ab..0111ad11363 100644 --- a/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp index 630565b7d77..750173dc342 100644 --- a/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp index 0a1a412921d..fb28e498c32 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp index 1e5307b2dca..3bf2afa2552 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S, class It> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp index ab813612058..5ae15f0a0a4 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp index 64f7bb6f6f0..5a9e8e2b814 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp index 7a6a276fe7a..b0a2eb5e5cb 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp index 920a0bc7ea2..00e6ae375cc 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp index 2568af4ef06..31f174b4f30 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp index 9f4081f4f89..ac74f202654 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp index b2c083415da..2dae1074596 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp index 3eefb7b8cac..83b5dd14b3f 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S, class It> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp index f9d0614126e..adf24ac4987 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp index 5a8f9ce09fc..476fe963de7 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp index 8c8dc6225c5..ac0e535eea2 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp index 486161256fb..a8f747091c6 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp index f58a8a49a13..d7ddb77b8e0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp index 5430be3227a..116673cc4dd 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp index f1e5a4ba22b..33801352816 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp index c9033dabdeb..6c2929d7f1d 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <exception> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp index be95fe2d415..d20fcd4623b 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <exception> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp index 1479171acdd..5015241ad63 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp index 13f97b45b66..6a23bf88ca5 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp index be3ee641b9f..a8443818aea 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp index c008196dcf0..0549e816b44 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp index 60d54965332..c44db71ae3b 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp index b9bc6ca184b..dbe6d7ba0e7 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp index e84a3ba12ec..790ce40b0a0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp @@ -18,7 +18,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp index a1c37a90542..bc9ec1cf825 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp index 9eff67e7f01..b9e5fa8bc06 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp @@ -19,7 +19,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp index 8fc469e3133..e091662eae0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp @@ -18,7 +18,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp index 593279cdbf5..38353dd2f4e 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S, class It> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp index e104072c73b..739c89404c1 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp @@ -18,7 +18,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp index 25016ae4719..734dd8dffb7 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp index 7f360993da1..29b00ec55b9 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp index 5fad9b703d7..fd85696704c 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp index 37ac686fa07..8c18941cf46 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp index b1c4f4bc29c..b7317a32b41 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp @@ -17,7 +17,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp index bea51ea3797..7384ae7f1d3 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp index 04d588322d6..c291028998d 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp index 9bdd2aa2a76..77b20d1bc08 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp index 8d5a949f337..33649792521 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp index 6bc7148be4b..20455b258c0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp index bdc4519305b..9295c5bde9f 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S, class It> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp index 6d552f0e747..cb4ce61d094 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp index a8968ef7a3a..b1d6ab1ba57 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp index b1b3d96ff94..b0e2234a7e5 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp index 95ef8be2de3..0f95492fdb1 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp index 4dd1a828af7..914081bbc45 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp @@ -19,7 +19,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp index 0b4aeafdab1..d9870428732 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp @@ -19,7 +19,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp index f8e13b83b58..33f57fd3b86 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp @@ -17,7 +17,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp index 08e906884df..c130780dc9d 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp @@ -17,7 +17,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp index 099980015ee..25e5c4433cc 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp index adc65cc5ab3..4973bda4ddf 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp index 2a3b03df6f7..4a912eaec6f 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp index a1ca8ce6ee7..6596f2fffa7 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp index 47e66efd8b9..84f52bb2e50 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp index 0565b37e732..a3c9911abe9 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp index 689fb7281e0..af806bc0457 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp index 5f777ba1c56..102e8ea0815 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp index 264494cb719..cee538800dd 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp index 6810c4f7600..cc08982a5ca 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp index e47214e6c08..b496d70dc2f 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp index 864da89d103..069b305111d 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp index 2d095a2b51f..4e09bf2464c 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp index a06157de8aa..9dc8a510beb 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp index fa5d0becf3f..4d72db595b1 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp index 0be44c752e2..47fc1ca51b8 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp index 4a9fabe381a..bf2ddd51f72 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp @@ -32,7 +32,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp index a64881cf502..19a5bdd977e 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp index 77ebe081d38..22006bb1be6 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp index 5946839b929..0bff70a977a 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp index 56af158ed96..f9fa204b9ee 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp index 0577ed0e594..daa6f40ae3c 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp index 3074bc93e71..95073bf7644 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp index 2105af0472c..eab117a843f 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp index 69359f765c3..56b3b35b3d9 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp index 32c340685bc..c02b202c49e 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp index 28e8db934fd..86f6a2db119 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp index 66063bb25cc..b935da5426f 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp index 3c5d115543d..487e2056f2c 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp index 05ab3196b02..21959405194 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp index 964d71c54be..bb1bce8d404 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp index 5758ae3c01f..2b975f160d5 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp index 3326b35a057..3bdb800bf73 100644 --- a/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp index c2c57f6f13d..917248fa691 100644 --- a/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp index 8d998171c64..b3892d72de5 100644 --- a/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp index c13905e206f..dda7428992a 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp index ca4b067a1ce..9ed58a3e9bb 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp index c94eaef37db..ee804d9cc6e 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp index 4312e276541..3deb617e8d8 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp index 8fa23b7ec25..29eba9a9767 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp index 58f576084c3..7de95a8cda5 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp index 302f725dced..590173eddf4 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp index 66b21aea39d..53d3a95292c 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp index 4416b826420..14ac4b2a153 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp index 3d28c2479be..4fb072fa474 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp index fd64fdf7802..32d0e86f3d8 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp index 59e00de36aa..6dd176df016 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp index 0c21a02fb5a..9e98a6ad20f 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp index d7db16f6e35..e409edc25f4 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp index f6ce46acf56..b130f9287ba 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp index 47c6d7ffd9b..3e6bd9d093e 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp index f131b962217..4db7762b275 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp index 6de632670c3..ba93adbe445 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp index 32aa77d5083..12765b71f28 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp index cfe71d2e787..f1b447c43f4 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp index 7d82dc0fe22..7f96e6351aa 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp index 98f78f80738..351c6727de2 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp index 3c48a77045d..24e58fc5f1a 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp index c3ea07976bf..e00d7fd8a3d 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp index f936651eb20..3006c466eed 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp index dc280d0aca2..a89df4e3ffa 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp index 8db67d9fa95..cbc0c9b3536 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp index 2b1efd336dc..450aebedd59 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp index 5699cabfbeb..47baf40b265 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp index d7c2e8503a6..05e6e517423 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp index 9612b583899..a73f70cd4b8 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void |
