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
2013-11-26 20:58:02 +00:00
parent bfaafd539c
commit 061d0cc4db
810 changed files with 808 additions and 1060 deletions
--- a/test/strings/basic.string/min_allocator.h
+++ b/test/strings/basic.string/min_allocator.h
@@ -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
--- 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
--- 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
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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
--- 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()
 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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()
 {
--- 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()
 {
--- 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
--- 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
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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
--- 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
--- 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
--- 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()
 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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()
 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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()
 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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()
 {
--- 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
--- 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
--- 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()
 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More