Skip to content
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

place alignas() before lifetime specifiers #11248

Closed
wants to merge 3 commits into from
Closed

place alignas() before lifetime specifiers #11248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bc7511
place alignas() before lifetime specifiers
mumbleskates Dec 10, 2022
146eef8
formatting
mumbleskates Dec 13, 2022
496af77
Merge remote-tracking branch 'origin/main' into alignas-fix
mumbleskates Dec 15, 2022
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
2 changes: 1 addition & 1 deletion src/google/protobuf/arena.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ ThreadSafeArena::SerialArenaChunk* ThreadSafeArena::SentrySerialArenaChunk() {
}


ABSL_CONST_INIT alignas(kCacheAlignment)
alignas(kCacheAlignment) ABSL_CONST_INIT
std::atomic<ThreadSafeArena::LifecycleId> ThreadSafeArena::lifecycle_id_{0};
#if defined(PROTOBUF_NO_THREADLOCAL)
ThreadSafeArena::ThreadCache& ThreadSafeArena::thread_cache() {
Expand Down
4 changes: 2 additions & 2 deletions src/google/protobuf/thread_safe_arena.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ class PROTOBUF_EXPORT ThreadSafeArena {
#pragma warning(disable : 4324)
#endif
using LifecycleId = uint64_t;
ABSL_CONST_INIT alignas(
kCacheAlignment) static std::atomic<LifecycleId> lifecycle_id_;
alignas(kCacheAlignment) ABSL_CONST_INIT
static std::atomic<LifecycleId> lifecycle_id_;
#if defined(PROTOBUF_NO_THREADLOCAL)
// iOS does not support __thread keyword so we use a custom thread local
// storage class we implemented.
Expand Down