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  <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 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>		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)