Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8323 from georgthegreat/patch-1

Browse Source 
Fix PROTOBUF_CONSTINIT macro redefinition
pull/8338/head
Adam Cozzette 4 years ago committed by GitHub
parent 326ea555ba 2e47e3bc64
commit a43ddfbd56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/google/protobuf/port_def.inc

11
src/google/protobuf/port_def.inc
Unescape View File

@ -575,17 +575,6 @@
#define PROTOBUF_CONSTINIT #define PROTOBUF_CONSTINIT
#endif #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
#endif
// Some globals with an empty non-trivial destructor are annotated with // Some globals with an empty non-trivial destructor are annotated with
// no_destroy for performance reasons. It reduces the cost of these globals in // no_destroy for performance reasons. It reduces the cost of these globals in
// non-opt mode and under sanitizers. // non-opt mode and under sanitizers.

Write Preview
Loading…
Cancel
Save