diff options
Diffstat (limited to 'libcxx/test/strings/basic.string')
20 files changed, 19 insertions, 94 deletions
diff --git a/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp index 4a447d5a8f0..bae76215552 100644 --- a/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp index b15b56977ec..512d1182755 100644 --- a/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp index fb6001f85b6..9c9fc323066 100644 --- a/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp index d18241e565a..cf8021019a2 100644 --- a/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp index ed68c93c7f3..f935db83d73 100644 --- a/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp index c4550833fb2..b3cc127fbc4 100644 --- a/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp index 60e62cc288c..d6ff8504e9d 100644 --- a/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp index 11f2b43c4ca..664cb80b10f 100644 --- a/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "../input_iterator.h" #include "min_allocator.h" diff --git a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp index 873e8891094..b94f189ecb4 100644 --- a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp @@ -16,7 +16,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp index 1f0d5cd7ca7..4e8b038ee84 100644 --- a/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp index fdcf4785fbc..32c9514a915 100644 --- a/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp index 60de3b029bf..5bc1c8a9153 100644 --- a/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp @@ -17,7 +17,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp index 42e828b8838..556aabdc44a 100644 --- a/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp index 8aa88c9fe72..f6e9e00e590 100644 --- a/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class charT> diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp index 629e2967b25..f1f107af20b 100644 --- a/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class charT> diff --git a/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp index a8e6fdf24f0..4dfe9063a23 100644 --- a/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class charT> diff --git a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp index 3e04a97bdcc..2a9bf2ac88b 100644 --- a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp index 01767e48e84..4d5d79693d0 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <string> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp index b3892d72de5..6ba040d2635 100644 --- a/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/test_allocator.h b/libcxx/test/strings/basic.string/test_allocator.h deleted file mode 100644 index 89852159d3c..00000000000 --- a/libcxx/test/strings/basic.string/test_allocator.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef TEST_ALLOCATOR_H -#define TEST_ALLOCATOR_H - -#include <cstddef> -#include <type_traits> -#include <cstdlib> -#include <new> -#include <climits> - -class test_alloc_base -{ -protected: - static int count; -public: - static int throw_after; -}; - -int test_alloc_base::count = 0; -int test_alloc_base::throw_after = INT_MAX; - -template <class T> -class test_allocator - : public test_alloc_base -{ - int data_; - - template <class U> friend class test_allocator; -public: - - typedef unsigned size_type; - typedef int difference_type; - typedef T value_type; - typedef value_type* pointer; - typedef const value_type* const_pointer; - typedef typename std::add_lvalue_reference<value_type>::type reference; - typedef typename std::add_lvalue_reference<const value_type>::type const_reference; - - template <class U> struct rebind {typedef test_allocator<U> other;}; - - test_allocator() throw() : data_(-1) {} - explicit test_allocator(int i) throw() : data_(i) {} - test_allocator(const test_allocator& a) throw() - : data_(a.data_) {} - template <class U> test_allocator(const test_allocator<U>& a) throw() - : data_(a.data_) {} - ~test_allocator() throw() {data_ = 0;} - pointer address(reference x) const {return &x;} - const_pointer address(const_reference x) const {return &x;} - pointer allocate(size_type n, const void* = 0) - { - if (count >= throw_after) { -#ifndef _LIBCPP_NO_EXCEPTIONS - throw std::bad_alloc(); -#else - std::terminate(); -#endif - } - ++count; - return (pointer)std::malloc(n * sizeof(T)); - } - void deallocate(pointer p, size_type n) - {std::free(p);} - size_type max_size() const throw() - {return UINT_MAX / sizeof(T);} - void construct(pointer p, const T& val) - {::new(p) T(val);} - void destroy(pointer p) {p->~T();} - - friend bool operator==(const test_allocator& x, const test_allocator& y) - {return x.data_ == y.data_;} - friend bool operator!=(const test_allocator& x, const test_allocator& y) - {return !(x == y);} -}; - -#endif // TEST_ALLOCATOR_H |
