mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 09:36:41 -04:00
13 lines
598 B
Text
13 lines
598 B
Text
Obtained from: https://cgit.freebsd.org/ports/commit/?id=c212fb9fcceacf49ac4f236c7944aaec5d3cfa57
|
|
|
|
--- src/google/protobuf/arena_impl.h.orig 2022-09-29 19:05:00 UTC
|
|
+++ src/google/protobuf/arena_impl.h
|
|
@@ -640,7 +640,7 @@ class PROTOBUF_EXPORT ThreadSafeArena {
|
|
#ifdef _MSC_VER
|
|
#pragma warning(disable : 4324)
|
|
#endif
|
|
- struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator {
|
|
+ struct alignas(alignof(std::atomic<LifecycleIdAtomic>)) CacheAlignedLifecycleIdGenerator {
|
|
std::atomic<LifecycleIdAtomic> id;
|
|
};
|
|
static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_;
|