diff options
| author | Jisi Liu <liujisi@google.com> | 2017-08-22 10:59:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 10:59:50 -0700 |
| commit | 7273b3c691cd46d609c5482e62f5b38f61281337 (patch) | |
| tree | a1640d9fdf31e8ba38a0da5cdd4f89cb588ed910 /src/google/protobuf/map.h | |
| parent | 09fd1259c8b76024b1365463c24762cd1b5b6144 (diff) | |
| parent | 36ac06fdc76ea9fd2cea5195a9685756b5bd4179 (diff) | |
| download | protobuf-7273b3c691cd46d609c5482e62f5b38f61281337.tar.gz protobuf-7273b3c691cd46d609c5482e62f5b38f61281337.tar.bz2 protobuf-7273b3c691cd46d609c5482e62f5b38f61281337.zip | |
Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1
Merge pull request #3535 from drivehappy/clang_warn_cleanup
Diffstat (limited to 'src/google/protobuf/map.h')
| -rw-r--r-- | src/google/protobuf/map.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index 6514a0cc..883556a7 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -181,7 +181,7 @@ class Map { MapAllocator(const MapAllocator<X>& allocator) : arena_(allocator.arena()) {} - pointer allocate(size_type n, const void* 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) { @@ -197,6 +197,7 @@ class Map { #if defined(__GXX_DELETE_WITH_SIZE__) || defined(__cpp_sized_deallocation) ::operator delete(p, n * sizeof(value_type)); #else + (void)n; ::operator delete(p); #endif } |