diff --git a/src/google/protobuf/arena.cc b/src/google/protobuf/arena.cc index b83793e300cf..6ac4bab6c6c1 100644 --- a/src/google/protobuf/arena.cc +++ b/src/google/protobuf/arena.cc @@ -453,7 +453,7 @@ ThreadSafeArena::ThreadCache& ThreadSafeArena::thread_cache() { return thread_cache; } #else -ABSL_CONST_INIT PROTOBUF_THREAD_LOCAL +PROTOBUF_CONSTINIT PROTOBUF_THREAD_LOCAL ThreadSafeArena::ThreadCache ThreadSafeArena::thread_cache_; #endif diff --git a/src/google/protobuf/thread_safe_arena.h b/src/google/protobuf/thread_safe_arena.h index 1da9d091e693..fa2be1b1cf5f 100644 --- a/src/google/protobuf/thread_safe_arena.h +++ b/src/google/protobuf/thread_safe_arena.h @@ -260,7 +260,7 @@ class PROTOBUF_EXPORT ThreadSafeArena { // wrap them in static functions. static ThreadCache& thread_cache(); #else - ABSL_CONST_INIT static PROTOBUF_THREAD_LOCAL ThreadCache thread_cache_; + PROTOBUF_CONSTINIT static PROTOBUF_THREAD_LOCAL ThreadCache thread_cache_; static ThreadCache& thread_cache() { return thread_cache_; } #endif