diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 16:26:16 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 16:26:16 -0700 |
| commit | 3af881c7e2db0553207876acbdb91c6e77974e44 (patch) | |
| tree | 35e2a96cce802d4235bd29afa396e28ead892fa2 /src/google/protobuf/arena.h | |
| parent | 86975301f1876ce1934612777b8ca6c76520f5cc (diff) | |
| parent | 942a29cecd36f2a4b22fdd2179635cd548e6bd27 (diff) | |
| download | protobuf-3af881c7e2db0553207876acbdb91c6e77974e44.tar.gz protobuf-3af881c7e2db0553207876acbdb91c6e77974e44.tar.bz2 protobuf-3af881c7e2db0553207876acbdb91c6e77974e44.zip | |
Merge master into 3.4.x
Diffstat (limited to 'src/google/protobuf/arena.h')
| -rw-r--r-- | src/google/protobuf/arena.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index 1497a6c5..f8a94705 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -810,13 +810,13 @@ class LIBPROTOBUF_EXPORT Arena { } template <typename T> static void CreateInArenaStorageInternal( - T* ptr, Arena* arena, google::protobuf::internal::false_type) { + T* ptr, Arena* /* arena */, google::protobuf::internal::false_type) { new (ptr) T(); } template <typename T> static void RegisterDestructorInternal( - T* ptr, Arena* arena, google::protobuf::internal::true_type) {} + T* /* ptr */, Arena* /* arena */, google::protobuf::internal::true_type) {} template <typename T> static void RegisterDestructorInternal( T* ptr, Arena* arena, google::protobuf::internal::false_type) { |