diff options
| author | Eric Christopher <echristo@gmail.com> | 2018-10-25 06:20:12 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2018-10-25 06:20:12 +0000 |
| commit | 9bbee38db3b12c47a898e2723b69342355cdfe4f (patch) | |
| tree | b5b93821f494c8d150aa4ff590b34ea9de1cee24 /libcxx/src/experimental/memory_resource.cpp | |
| parent | 199325450932a06d4392cb4d87fd69fc163b00eb (diff) | |
| download | bcm5719-llvm-9bbee38db3b12c47a898e2723b69342355cdfe4f.tar.gz bcm5719-llvm-9bbee38db3b12c47a898e2723b69342355cdfe4f.zip | |
Temporarily Revert "Implement sized deallocation for std::allocator and friends."
This is breaking the bots here (and related): http://lab.llvm.org:8011/builders/libcxx-libcxxabi-x86_64-linux-ubuntu-asan/builds/1428
This reverts commit r345214.
llvm-svn: 345239
Diffstat (limited to 'libcxx/src/experimental/memory_resource.cpp')
| -rw-r--r-- | libcxx/src/experimental/memory_resource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/experimental/memory_resource.cpp b/libcxx/src/experimental/memory_resource.cpp index 1f31f88d808..a3b64cc8b49 100644 --- a/libcxx/src/experimental/memory_resource.cpp +++ b/libcxx/src/experimental/memory_resource.cpp @@ -33,8 +33,8 @@ protected: virtual void* do_allocate(size_t __size, size_t __align) { return _VSTD::__libcpp_allocate(__size, __align); /* FIXME */} - virtual void do_deallocate(void * __p, size_t __n, size_t __align) - { _VSTD::__libcpp_deallocate(__p, __n, __align); /* FIXME */ } + virtual void do_deallocate(void * __p, size_t, size_t __align) + { _VSTD::__libcpp_deallocate(__p, __align); /* FIXME */ } virtual bool do_is_equal(memory_resource const & __other) const _NOEXCEPT { return &__other == this; } |
