Эх сурвалжийг харах

Change hint type to `const void*` (#2568)

This is both more correct, and the build fails on AIX without it
Matt Hauck 8 жил өмнө
parent
commit
25ecd559cc

+ 1 - 1
src/google/protobuf/map.h

@@ -592,7 +592,7 @@ class Map {
     MapAllocator(const MapAllocator<X>& allocator)
     MapAllocator(const MapAllocator<X>& allocator)
         : arena_(allocator.arena()) {}
         : 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
       // If arena is not given, malloc needs to be called which doesn't
       // construct element object.
       // construct element object.
       if (arena_ == NULL) {
       if (arena_ == NULL) {