From 4483dd3fa3b56e0a5516b6a588dbb25ab3d1690f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Dumont?= <fdumont@gcc.gnu.org>
Date: Sun, 23 Dec 2018 18:11:38 +0000
Subject: [PATCH] =?utf8?q?2018-12-23=20=20Fran=C3=A7ois=20Dumont=20=20<fdu?=
 =?utf8?q?mont@gcc.gnu.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

	* 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
---
 libstdc++-v3/ChangeLog                            | 4 ++++
 libstdc++-v3/testsuite/util/testsuite_allocator.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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