diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index ef64b76879..698dc3bb1b 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include // IWYU pragma: keep for operator new(). #include #include #include @@ -25,8 +25,6 @@ namespace std { using type_info = ::type_info; } -#else -#include #endif #include "absl/base/attributes.h" @@ -81,17 +79,6 @@ class TcParser; // defined in generated_message_tctable_impl.h template class GenericTypeHandler; // defined in repeated_field.h -template -struct ObjectDestructor { - constexpr static void (*destructor)(void*) = - &internal::cleanup::arena_destruct_object; -}; - -template -struct ObjectDestructor { - constexpr static void (*destructor)(void*) = nullptr; -}; - template void arena_delete_object(void* object) { delete reinterpret_cast(object);