There were two identical files named 'min_allocator.h'. Move one of them to /support and delete the other. Then adjust all the tests that used them to include the moved one. No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@195785 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/strings/basic.string/min_allocator.h b/test/strings/basic.string/min_allocator.h
deleted file mode 100644
index c0d28e5..0000000
--- a/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/test/strings/basic.string/string.access/at.pass.cpp b/test/strings/basic.string/string.access/at.pass.cpp
index e24b560..8fada8f 100644
--- a/test/strings/basic.string/string.access/at.pass.cpp
+++ b/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/test/strings/basic.string/string.access/back.pass.cpp b/test/strings/basic.string/string.access/back.pass.cpp
index ed0d327..e915214 100644
--- a/test/strings/basic.string/string.access/back.pass.cpp
+++ b/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/test/strings/basic.string/string.access/db_back.pass.cpp b/test/strings/basic.string/string.access/db_back.pass.cpp
index b153249..2b31fab 100644
--- a/test/strings/basic.string/string.access/db_back.pass.cpp
+++ b/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/test/strings/basic.string/string.access/db_cback.pass.cpp b/test/strings/basic.string/string.access/db_cback.pass.cpp
index ece27a6..7feb423 100644
--- a/test/strings/basic.string/string.access/db_cback.pass.cpp
+++ b/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/test/strings/basic.string/string.access/db_cfront.pass.cpp b/test/strings/basic.string/string.access/db_cfront.pass.cpp
index d36885e..9f7785b 100644
--- a/test/strings/basic.string/string.access/db_cfront.pass.cpp
+++ b/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/test/strings/basic.string/string.access/db_cindex.pass.cpp b/test/strings/basic.string/string.access/db_cindex.pass.cpp
index 385c219..6294200 100644
--- a/test/strings/basic.string/string.access/db_cindex.pass.cpp
+++ b/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/test/strings/basic.string/string.access/db_front.pass.cpp b/test/strings/basic.string/string.access/db_front.pass.cpp
index 15985fa..ff675bc 100644
--- a/test/strings/basic.string/string.access/db_front.pass.cpp
+++ b/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/test/strings/basic.string/string.access/db_index.pass.cpp b/test/strings/basic.string/string.access/db_index.pass.cpp
index 82b1190..b20e201 100644
--- a/test/strings/basic.string/string.access/db_index.pass.cpp
+++ b/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/test/strings/basic.string/string.access/front.pass.cpp b/test/strings/basic.string/string.access/front.pass.cpp
index 807e936..ed80916 100644
--- a/test/strings/basic.string/string.access/front.pass.cpp
+++ b/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/test/strings/basic.string/string.access/index.pass.cpp b/test/strings/basic.string/string.access/index.pass.cpp
index 567eeee..cd31623 100644
--- a/test/strings/basic.string/string.access/index.pass.cpp
+++ b/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/test/strings/basic.string/string.capacity/capacity.pass.cpp b/test/strings/basic.string/string.capacity/capacity.pass.cpp
index 22ca1f3..4a447d5 100644
--- a/test/strings/basic.string/string.capacity/capacity.pass.cpp
+++ b/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/test/strings/basic.string/string.capacity/clear.pass.cpp b/test/strings/basic.string/string.capacity/clear.pass.cpp
index ba8ba24..b73af75 100644
--- a/test/strings/basic.string/string.capacity/clear.pass.cpp
+++ b/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/test/strings/basic.string/string.capacity/empty.pass.cpp b/test/strings/basic.string/string.capacity/empty.pass.cpp
index 29f62cd..ac65f51 100644
--- a/test/strings/basic.string/string.capacity/empty.pass.cpp
+++ b/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/test/strings/basic.string/string.capacity/length.pass.cpp b/test/strings/basic.string/string.capacity/length.pass.cpp
index 5ddb5c1..d3ae1aa 100644
--- a/test/strings/basic.string/string.capacity/length.pass.cpp
+++ b/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/test/strings/basic.string/string.capacity/max_size.pass.cpp b/test/strings/basic.string/string.capacity/max_size.pass.cpp
index 0fe7f12..e6a3aa4 100644
--- a/test/strings/basic.string/string.capacity/max_size.pass.cpp
+++ b/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/test/strings/basic.string/string.capacity/reserve.pass.cpp b/test/strings/basic.string/string.capacity/reserve.pass.cpp
index 6fdb457..a155825 100644
--- a/test/strings/basic.string/string.capacity/reserve.pass.cpp
+++ b/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/test/strings/basic.string/string.capacity/resize_size.pass.cpp b/test/strings/basic.string/string.capacity/resize_size.pass.cpp
index d1b66a4..14fe209 100644
--- a/test/strings/basic.string/string.capacity/resize_size.pass.cpp
+++ b/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/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp b/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp
index 9fb0c8c..f293df9 100644
--- a/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp
+++ b/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/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp b/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp
index 310ccec..aacbffd 100644
--- a/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp
+++ b/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/test/strings/basic.string/string.capacity/size.pass.cpp b/test/strings/basic.string/string.capacity/size.pass.cpp
index 9d51ca1..21b475a 100644
--- a/test/strings/basic.string/string.capacity/size.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/alloc.pass.cpp b/test/strings/basic.string/string.cons/alloc.pass.cpp
index 3a8c571..b15b569 100644
--- a/test/strings/basic.string/string.cons/alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/char_assignment.pass.cpp b/test/strings/basic.string/string.cons/char_assignment.pass.cpp
index 4d750d8..1c582bc 100644
--- a/test/strings/basic.string/string.cons/char_assignment.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/copy.pass.cpp b/test/strings/basic.string/string.cons/copy.pass.cpp
index 3ebb228..fb6001f 100644
--- a/test/strings/basic.string/string.cons/copy.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/copy_alloc.pass.cpp b/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
index 693ecf3..d18241e 100644
--- a/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/copy_assignment.pass.cpp b/test/strings/basic.string/string.cons/copy_assignment.pass.cpp
index 10c49e5..ccb6c59 100644
--- a/test/strings/basic.string/string.cons/copy_assignment.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/initializer_list.pass.cpp b/test/strings/basic.string/string.cons/initializer_list.pass.cpp
index 7654901..60e62cc 100644
--- a/test/strings/basic.string/string.cons/initializer_list.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp b/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
index 6bbf51a..7530768 100644
--- a/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/iter_alloc.pass.cpp b/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
index ebd0974..11f2b43 100644
--- a/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/move.pass.cpp b/test/strings/basic.string/string.cons/move.pass.cpp
index ba68087..873e889 100644
--- a/test/strings/basic.string/string.cons/move.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/move_alloc.pass.cpp b/test/strings/basic.string/string.cons/move_alloc.pass.cpp
index 80aadcb..1f0d5cd 100644
--- a/test/strings/basic.string/string.cons/move_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/move_assignment.pass.cpp b/test/strings/basic.string/string.cons/move_assignment.pass.cpp
index 3e6626b..60de3b0 100644
--- a/test/strings/basic.string/string.cons/move_assignment.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
index befb143..8aa88c9 100644
--- a/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp b/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp
index d035837..c691613 100644
--- a/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp b/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
index dbfcec7..629e296 100644
--- a/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
index a427d72..a8e6fdf 100644
--- a/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
+++ b/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/test/strings/basic.string/string.cons/substr.pass.cpp b/test/strings/basic.string/string.cons/substr.pass.cpp
index 1607211..3e04a97 100644
--- a/test/strings/basic.string/string.cons/substr.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/begin.pass.cpp b/test/strings/basic.string/string.iterators/begin.pass.cpp
index fddd6e6..55f2eb3 100644
--- a/test/strings/basic.string/string.iterators/begin.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/cbegin.pass.cpp b/test/strings/basic.string/string.iterators/cbegin.pass.cpp
index 9a9f042..d0c6ddb 100644
--- a/test/strings/basic.string/string.iterators/cbegin.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/cend.pass.cpp b/test/strings/basic.string/string.iterators/cend.pass.cpp
index cca6ff6..6b86d26 100644
--- a/test/strings/basic.string/string.iterators/cend.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/crbegin.pass.cpp b/test/strings/basic.string/string.iterators/crbegin.pass.cpp
index dbff2a5..6f29f43 100644
--- a/test/strings/basic.string/string.iterators/crbegin.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/crend.pass.cpp b/test/strings/basic.string/string.iterators/crend.pass.cpp
index 109c583..1fb422c 100644
--- a/test/strings/basic.string/string.iterators/crend.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp b/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
index d9011f5..6cac187 100644
--- a/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp b/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
index 3773dba..d90387e 100644
--- a/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp b/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
index f82349a..c4a2d0a 100644
--- a/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp b/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
index 8324c87..ce44cb1 100644
--- a/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp b/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
index fff3907..8fab8ba 100644
--- a/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp b/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
index c36644b..d1cac07 100644
--- a/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp b/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
index d2b779b..914c77d 100644
--- a/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/end.pass.cpp b/test/strings/basic.string/string.iterators/end.pass.cpp
index b3732da..02180bb 100644
--- a/test/strings/basic.string/string.iterators/end.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/rbegin.pass.cpp b/test/strings/basic.string/string.iterators/rbegin.pass.cpp
index edb02d7..0111ad1 100644
--- a/test/strings/basic.string/string.iterators/rbegin.pass.cpp
+++ b/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/test/strings/basic.string/string.iterators/rend.pass.cpp b/test/strings/basic.string/string.iterators/rend.pass.cpp
index 630565b..750173d 100644
--- a/test/strings/basic.string/string.iterators/rend.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
index 0a1a412..fb28e49 100644
--- a/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
index 1e5307b..3bf2afa 100644
--- a/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
index ab81361..5ae15f0 100644
--- a/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
index 64f7bb6..5a9e8e2 100644
--- a/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
index 7a6a276..b0a2eb5 100644
--- a/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
index 920a0bc..00e6ae3 100644
--- a/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
index 2568af4..31f174b 100644
--- a/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
index 9f4081f..ac74f20 100644
--- a/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
index b2c0834..2dae107 100644
--- a/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
index 3eefb7b..83b5dd1 100644
--- a/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
index f9d0614..adf24ac 100644
--- a/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
index 5a8f9ce..476fe96 100644
--- a/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
index 8c8dc62..ac0e535 100644
--- a/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
index 4861612..a8f7470 100644
--- a/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
index f58a8a4..d7ddb77 100644
--- a/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
index 5430be3..116673c 100644
--- a/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp b/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
index f1e5a4b..3380135 100644
--- a/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp
index c9033da..6c2929d 100644
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp
index be95fe2..d20fcd4 100644
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp
index 1479171..5015241 100644
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp
index 13f97b4..6a23bf8 100644
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp
index be3ee64..a844381 100644
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp
index c008196..0549e81 100644
--- a/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
index 60d5496..c44db71 100644
--- a/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
index b9bc6ca..dbe6d7b 100644
--- a/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
index e84a3ba..790ce40 100644
--- a/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
index a1c37a9..bc9ec1c 100644
--- a/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
index 9eff67e..b9e5fa8 100644
--- a/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
index 8fc469e..e091662 100644
--- a/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
index 593279c..38353dd 100644
--- a/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
index e104072..739c894 100644
--- a/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
index 25016ae..734dd8d 100644
--- a/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
index 7f36099..29b00ec 100644
--- a/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
index 5fad9b7..fd85696 100644
--- a/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
index 37ac686..8c18941 100644
--- a/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
index b1c4f4b..b7317a3 100644
--- a/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp b/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp
index bea51ea..7384ae7 100644
--- a/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp b/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp
index 04d5883..c291028 100644
--- a/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp
index 9bdd2aa..77b20d1 100644
--- a/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp b/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp
index 8d5a949..3364979 100644
--- a/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
index 6bc7148..20455b2 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
index bdc4519..9295c5b 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
index 6d552f0..cb4ce61 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
index a8968ef..b1d6ab1 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
index b1b3d96..b0e2234 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
index 95ef8be..0f95492 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
index 4dd1a82..914081b 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
index 0b4aeaf..d987042 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
index f8e13b8..33f57fd 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
index 08e9068..c130780 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
index 0999800..25e5c44 100644
--- a/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp b/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
index adc65cc..4973bda 100644
--- a/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp b/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
index 2a3b03d..4a912ea 100644
--- a/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp b/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
index a1ca8ce..6596f2f 100644
--- a/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp b/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
index 47e66ef..84f52bb 100644
--- a/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp b/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
index 0565b37..a3c9911 100644
--- a/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp b/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
index 689fb72..af806bc 100644
--- a/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp b/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
index 5f777ba..102e8ea 100644
--- a/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp b/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
index 264494c..cee5388 100644
--- a/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_op\041=/pointer_string.pass.cpp" "b/test/strings/basic.string/string.nonmembers/string_op\041=/pointer_string.pass.cpp"
index 6810c4f..cc08982 100644
--- "a/test/strings/basic.string/string.nonmembers/string_op\041=/pointer_string.pass.cpp"
+++ "b/test/strings/basic.string/string.nonmembers/string_op\041=/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/test/strings/basic.string/string.nonmembers/string_op\041=/string_pointer.pass.cpp" "b/test/strings/basic.string/string.nonmembers/string_op\041=/string_pointer.pass.cpp"
index e47214e..b496d70 100644
--- "a/test/strings/basic.string/string.nonmembers/string_op\041=/string_pointer.pass.cpp"
+++ "b/test/strings/basic.string/string.nonmembers/string_op\041=/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/test/strings/basic.string/string.nonmembers/string_op\041=/string_string.pass.cpp" "b/test/strings/basic.string/string.nonmembers/string_op\041=/string_string.pass.cpp"
index 864da89..069b305 100644
--- "a/test/strings/basic.string/string.nonmembers/string_op\041=/string_string.pass.cpp"
+++ "b/test/strings/basic.string/string.nonmembers/string_op\041=/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/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
index 2d095a2..4e09bf2 100644
--- a/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
index a06157d..9dc8a51 100644
--- a/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
index fa5d0be..4d72db5 100644
--- a/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
index 0be44c7..47fc1ca 100644
--- a/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
index 4a9fabe..bf2ddd5 100644
--- a/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
index a64881c..19a5bdd 100644
--- a/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
index 77ebe08..22006bb 100644
--- a/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
index 5946839..0bff70a 100644
--- a/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
index 56af158..f9fa204 100644
--- a/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
index 0577ed0..daa6f40 100644
--- a/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
index 3074bc9..95073bf 100644
--- a/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
index 2105af0..eab117a 100644
--- a/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
index 69359f7..56b3b35 100644
--- a/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
index 32c3406..c02b202 100644
--- a/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
index 28e8db9..86f6a2d 100644
--- a/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
index 66063bb..b935da5 100644
--- a/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
index 3c5d115..487e205 100644
--- a/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
index 05ab319..2195940 100644
--- a/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
index 964d71c..bb1bce8 100644
--- a/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
index 5758ae3..2b975f1 100644
--- a/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp b/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
index 3326b35..3bdb800 100644
--- a/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp b/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp
index c2c57f6..917248f 100644
--- a/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp b/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
index 8d99817..b3892d7 100644
--- a/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp b/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
index c13905e..dda7428 100644
--- a/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp b/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
index ca4b067..9ed58a3 100644
--- a/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
index c94eaef..ee804d9 100644
--- a/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp b/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
index 4312e27..3deb617 100644
--- a/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
index 8fa23b7..29eba9a 100644
--- a/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_compare/string.pass.cpp b/test/strings/basic.string/string.ops/string_compare/string.pass.cpp
index 58f5760..7de95a8 100644
--- a/test/strings/basic.string/string.ops/string_compare/string.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
index 302f725..590173e 100644
--- a/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
index 66b21ae..53d3a95 100644
--- a/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
index 4416b82..14ac4b2 100644
--- a/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
index 3d28c24..4fb072f 100644
--- a/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
index fd64fdf..32d0e86 100644
--- a/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
index 59e00de..6dd176d 100644
--- a/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
index 0c21a02..9e98a6a 100644
--- a/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
index d7db16f..e409edc 100644
--- a/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
index f6ce46a..b130f92 100644
--- a/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
index 47c6d7f..3e6bd9d 100644
--- a/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
index f131b96..4db7762 100644
--- a/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
index 6de6326..ba93adb 100644
--- a/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
index 32aa77d..12765b7 100644
--- a/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
index cfe71d2..f1b447c 100644
--- a/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
index 7d82dc0..7f96e63 100644
--- a/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
index 98f78f8..351c672 100644
--- a/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp
index 3c48a77..24e58fc 100644
--- a/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
index c3ea079..e00d7fd 100644
--- a/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
index f936651..3006c46 100644
--- a/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp
index dc280d0..a89df4e 100644
--- a/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
index 8db67d9..cbc0c9b 100644
--- a/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
index 2b1efd3..450aebe 100644
--- a/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
index 5699cab..47baf40 100644
--- a/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
index d7c2e85..05e6e51 100644
--- a/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
+++ b/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/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp b/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp
index 9612b58..a73f70c 100644
--- a/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp
+++ b/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