Fix PROTOBUF_CONSTINIT macro redifinition

The #ifdef block is duplicated with the above (which was fixed in 3.15.1).

It would be great to have this fix backported to 3.15.1 (and released as 3.15.2).
pull/8338/head^2
Yuriy Chernyshov 4 years ago committed by Adam Cozzette
parent 2ff31d34aa
commit 09f94e7311
  1. 11
      src/google/protobuf/port_def.inc

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

Loading…
Cancel
Save