Fixed Visual Studio 2022: protobuf\src\google\protobuf\arena.cc(457,51): error C2127: 'thread_cache_': illegal initialization of 'constinit' entity with a non-constant expression #11672

2 years ago · ed65deafa7
parent f4d26f955d
commit ed65deafa7
2 changed files with 2 additions and 2 deletions
--- 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
-PROTOBUF_THREAD_LOCAL
+PROTOBUF_CONSTINIT PROTOBUF_THREAD_LOCAL
    ThreadSafeArena::ThreadCache ThreadSafeArena::thread_cache_;
 #endif

--- 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
-  static PROTOBUF_THREAD_LOCAL ThreadCache thread_cache_;
+  PROTOBUF_CONSTINIT static PROTOBUF_THREAD_LOCAL ThreadCache thread_cache_;
  static ThreadCache& thread_cache() { return thread_cache_; }
 #endif