diff options
| author |  Matt Hauck <matthauck@gmail.com> | 2017-03-01 10:43:28 -0800 |
|---|---|---|
| committer |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-03-01 10:43:28 -0800 |
| commit | 25ecd559cca5da3e30ad219d13b3ec9c19f6718e (patch) | |
| tree | a5ec71878ecb37a9af5cbd4e9c1a33cd9da74d23 /src/google/protobuf/map.h | |
| parent | bcbaabe53a8d661f5a473d2a157a4278ad8bf579 (diff) | |
Change hint type to `const void*` (#2568)
This is both more correct, and the build fails on AIX without it
Diffstat (limited to 'src/google/protobuf/map.h')
| -rw-r--r-- | src/google/protobuf/map.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<X>& 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) { |