From 25ecd559cca5da3e30ad219d13b3ec9c19f6718e Mon Sep 17 00:00:00 2001 From: Matt Hauck Date: Wed, 1 Mar 2017 10:43:28 -0800 Subject: Change hint type to `const void*` (#2568) This is both more correct, and the build fails on AIX without it --- src/google/protobuf/map.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index 6458714e..adb4a33e 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -592,7 +592,7 @@ class Map { MapAllocator(const MapAllocator& allocator) : arena_(allocator.arena()) {} - pointer allocate(size_type n, const_pointer hint = 0) { + pointer allocate(size_type n, const void* hint = 0) { // If arena is not given, malloc needs to be called which doesn't // construct element object. if (arena_ == NULL) { -- cgit v1.2.3