diff options
| author |  Jisi Liu <liujisi@google.com> | 2017-08-21 15:45:59 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-08-21 15:45:59 -0700 |
| commit | 0b7e97880c1ac3b3a7bfeccc51a5b852c8bd37ee (patch) | |
| tree | caa76d0bd90f3fddb4527a891f0c93cfc0d9ebdb /src/google/protobuf/map.h | |
| parent | ba4e54724d2e6a1881c4fe88664d81fbacaf8c08 (diff) | |
| parent | 1183f4864bfedfbd21e061c236c9ff47961832ae (diff) | |
Merge pull request #3535 from drivehappy/clang_warn_cleanup
Fixing unused parameter warnings under Clang.
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 } |