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

Jump to bottom

C++ port_def.inc: don't set PROTOBUF_CONSTINIT on mingw-w64 #8299

Closed
wants to merge 2 commits into from
Closed

C++ port_def.inc: don't set PROTOBUF_CONSTINIT on mingw-w64 #8299

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9b4c3f
port_def.inc: Remove duplicate PROTOBUF_CONSTINIT
1480c1 Feb 16, 2021
7c58123
port_def.inc: Don't set PROTOBUF_CONSTINIT on mingw-w64
1480c1 Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 2 additions & 11 deletions src/google/protobuf/port_def.inc
View file
Open in desktop
Expand Up @@ -477,7 +477,7 @@
#endif // _MSC_VER

#if defined(__clang__) || defined(__GNUC__) || defined(_MSC_VER)
// Don't let Objective-C Macros interfere with proto identifiers with the same
// Don't let Objective-C Macros interfere with proto identifiers with the same
// name.
#pragma push_macro("DEBUG")
#undef DEBUG
Expand Down Expand Up @@ -562,23 +562,14 @@
// by this flag is supposed to be removed after this experiment.
// #define PROTOBUF_MESSAGE_OWNED_ARENA_EXPERIMENT

#ifndef __MINGW32__
#if defined(__cpp_constinit)
#define PROTOBUF_CONSTINIT constinit
#elif defined(__has_cpp_attribute)
#if __has_cpp_attribute(clang::require_constant_initialization)
#define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]]
#endif
#endif
#ifndef PROTOBUF_CONSTINIT
#define PROTOBUF_CONSTINIT
#endif

#if defined(__cpp_constinit)
#define PROTOBUF_CONSTINIT constinit
#elif defined(__has_cpp_attribute)
#if __has_cpp_attribute(clang::require_constant_initialization)
#define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]]
#endif
#endif
#ifndef PROTOBUF_CONSTINIT
#define PROTOBUF_CONSTINIT
Expand Down