Browse Source

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).
Yuriy Chernyshov 4 năm trước cách đây
mục cha
commit
09f94e7311
1 tập tin đã thay đổi với 0 bổ sung11 xóa
  1. 0 11
      src/google/protobuf/port_def.inc

+ 0 - 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.