merged from upstream

3 years ago · 8b4a62b4b3
parent 733f59d52e
commit 8b4a62b4b3
1 changed files with 0 additions and 4 deletions
--- a/src/google/protobuf/arena.cc
+++ b/src/google/protobuf/arena.cc
@ -153,12 +153,8 @@ void* SerialArena::AllocateAlignedWithCleanupFallback(
 PROTOBUF_NOINLINE
 void SerialArena::AddCleanupFallback(void* elem, void (*destructor)(void*),
                                     const AllocationPolicy* policy) {
-<<<<<<< HEAD
-  AllocateNewBlock(0, policy);
-=======
  size_t required = cleanup::Size(destructor);
  AllocateNewBlock(required, policy);
->>>>>>> 87d285c785cd1a4334e3e21e5d468a9bc3e85f62
  AddCleanupFromExisting(elem, destructor);
 }