From: François Dumont Date: Sun, 23 Dec 2018 18:11:38 +0000 (+0000) Subject: 2018-12-23 François Dumont X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4483dd3fa3b56e0a5516b6a588dbb25ab3d1690f;p=gcc.git 2018-12-23 François Dumont * 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 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index dd67656b63e..1458251c745 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2018-12-23 François Dumont + * 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 b0fecfb59a3..c18223475c9 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_pointer; typedef Ptr const_void_pointer; - pointer allocate(std::size_t n, pointer = {}) + pointer allocate(std::size_t n, const_void_pointer = {}) { return pointer(std::allocator::allocate(n)); } void deallocate(pointer p, std::size_t n)