Skip to content

Automated Code Change #1483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2025
Merged

Automated Code Change #1483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions common/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1363,7 +1363,7 @@ class PoolingMemoryManager final {
// the destructor may be called at some point in the future.
static bool OwnCustomDestructor(google::protobuf::Arena* ABSL_NONNULL arena,
void* object,
absl::Nonnull<void (*)(void*)> destruct) {
void (*ABSL_NONNULL destruct)(void*)) {
ABSL_DCHECK(destruct != nullptr);
arena->OwnCustomDestructor(object, destruct);
return true;
Expand Down Expand Up @@ -1458,8 +1458,7 @@ class MemoryManager final {
// be called at some point in the future, `false` if will definitely not be
// called. All pooling memory managers return `true` while the reference
// counting memory manager returns `false`.
bool OwnCustomDestructor(void* object,
absl::Nonnull<void (*)(void*)> destruct) {
bool OwnCustomDestructor(void* object, void (*ABSL_NONNULL destruct)(void*)) {
ABSL_DCHECK(destruct != nullptr);
if (arena_ == nullptr) {
return false;
Expand Down