aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@gmail.com>2016-11-04 12:19:46 -0700
committerGitHub <noreply@github.com>2016-11-04 12:19:46 -0700
commit0d7199edc802299bdba39400c04f119c7db82667 (patch)
tree10aa8007c65399dda496cf7d14e4ed65e4651480
parentca800ea823a380fb3f0ddb490962b9021cd0c1eb (diff)
parent8785004c80a67ca85ff1eb876e08ac64c9eba394 (diff)
downloadprotobuf-0d7199edc802299bdba39400c04f119c7db82667.tar.gz
protobuf-0d7199edc802299bdba39400c04f119c7db82667.tar.bz2
protobuf-0d7199edc802299bdba39400c04f119c7db82667.zip
Merge pull request #2329 from acozzette/unused-parameter
Fix unused parameter warnings in arena_free
-rw-r--r--src/google/protobuf/arena.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h
index f05277ed..87066507 100644
--- a/src/google/protobuf/arena.h
+++ b/src/google/protobuf/arena.h
@@ -83,6 +83,7 @@ inline void arena_free(void* object, size_t size) {
#if defined(__GXX_DELETE_WITH_SIZE__) || defined(__cpp_sized_deallocation)
::operator delete(object, size);
#else
+ (void)size;
::operator delete(object);
#endif
}