diff options
Diffstat (limited to 'libcxx/test/support')
| -rw-r--r-- | libcxx/test/support/allocators.h | 2 | ||||
| -rw-r--r-- | libcxx/test/support/test_allocator.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/test/support/allocators.h b/libcxx/test/support/allocators.h index 7c2103ff272..4aa467f824a 100644 --- a/libcxx/test/support/allocators.h +++ b/libcxx/test/support/allocators.h @@ -101,7 +101,7 @@ public: A2& operator=(const A2& a) TEST_NOEXCEPT { id_ = a.id(); copy_called = true; return *this;} A2& operator=(A2&& a) TEST_NOEXCEPT { id_ = a.id(); move_called = true; return *this;} - T* allocate(std::size_t n, const void* hint) + T* allocate(std::size_t, const void* hint) { allocate_called = true; return (T*)hint; diff --git a/libcxx/test/support/test_allocator.h b/libcxx/test/support/test_allocator.h index 3ca672f89a9..ce61f3822e6 100644 --- a/libcxx/test/support/test_allocator.h +++ b/libcxx/test/support/test_allocator.h @@ -76,7 +76,7 @@ public: ++alloc_count; return (pointer)::operator new(n * sizeof(T)); } - void deallocate(pointer p, size_type n) + void deallocate(pointer p, size_type) {assert(data_ >= 0); --alloc_count; ::operator delete((void*)p);} size_type max_size() const throw() {return UINT_MAX / sizeof(T);} @@ -136,7 +136,7 @@ public: ++alloc_count; return (pointer)::operator new (n * sizeof(T)); } - void deallocate(pointer p, size_type n) + void deallocate(pointer p, size_type) {assert(data_ >= 0); --alloc_count; ::operator delete((void*)p); } size_type max_size() const throw() {return UINT_MAX / sizeof(T);} @@ -201,7 +201,7 @@ public: : data_(a.data_) {} T* allocate(std::size_t n) {return (T*)::operator new(n * sizeof(T));} - void deallocate(T* p, std::size_t n) + void deallocate(T* p, std::size_t) {::operator delete((void*)p);} other_allocator select_on_container_copy_construction() const |
