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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@267381 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dd67656b63e1f60501dba8a0a13a1abce059447a..1458251c74570a177771696144df766b7024c24a 100644 (file)
--- 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 b0fecfb59a31eae1fd37a9f4a2b1a01a965e63b4..c18223475c963f0ed49264177dfdf235936157ab 100644 (file)
--- 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)