diff options
| author | François Dumont <fdumont@gcc.gnu.org> | 2018-12-23 18:11:38 +0000 |
|---|---|---|
| committer | François Dumont <fdumont@gcc.gnu.org> | 2018-12-23 18:11:38 +0000 |
| commit | 4483dd3fa3b56e0a5516b6a588dbb25ab3d1690f (patch) | |
| tree | 5477b8ea5e4d9adc52bc40cd52fd5b1840016437 | |
| parent | 23d5fd6cd6b48b64826f001c55c5591eedab152c (diff) | |
| download | gcc-4483dd3fa3b56e0a5516b6a588dbb25ab3d1690f.zip gcc-4483dd3fa3b56e0a5516b6a588dbb25ab3d1690f.tar.gz gcc-4483dd3fa3b56e0a5516b6a588dbb25ab3d1690f.tar.bz2 | |
2018-12-23 François Dumont <fdumont@gcc.gnu.org>
* libstdc++-v3/testsuite/util/testsuite_allocator.h
(CustomPointerAlloc<>::allocate(size_t, pointer)): Replace by...
(CustomPointerAlloc<>::allocate(size_t, const_void_pointer)): ...this.
From-SVN: r267381
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_allocator.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index dd67656..1458251 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2018-12-23 François Dumont <fdumont@gcc.gnu.org> + * libstdc++-v3/testsuite/util/testsuite_allocator.h + (CustomPointerAlloc<>::allocate(size_t, pointer)): Replace by... + (CustomPointerAlloc<>::allocate(size_t, const_void_pointer)): ...this. + Respect pointer_traits on node deallocation in _ReuseOrAllocNode parenthesis operator. diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h index b0fecfb..c182234 100644 --- a/libstdc++-v3/testsuite/util/testsuite_allocator.h +++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h @@ -582,7 +582,7 @@ namespace __gnu_test typedef Ptr<void> void_pointer; typedef Ptr<const void> const_void_pointer; - pointer allocate(std::size_t n, pointer = {}) + pointer allocate(std::size_t n, const_void_pointer = {}) { return pointer(std::allocator<Tp>::allocate(n)); } void deallocate(pointer p, std::size_t n) |