Dirk Mueller
5a8a5cc42e
- update to 21.3: * C++ * Add header search paths to Protobuf-C++.podspec (#10024) * Fixed Visual Studio constinit errors (#10232) * Fix #9947: make the ABI compatible between debug and non-debug builds (#10271) * UPB * Allow empty package names (fixes behavior regression in 4.21.0) * Fix a SEGV bug when comparing a non-materialized sub-message (#10208) * Fix several bugs in descriptor mapping containers (eg. descriptor.services_by_name) * for x in mapping now yields keys rather than values, to match Python conventions and the behavior of the old library. * Lookup operations now correctly reject unhashable types as map keys. * We implement repr() to use the same format as dict. * Fix maps to use the ScalarMapContainer class when appropriate * Fix bug when parsing an unknown value in a proto2 enum extension (protocolbuffers/upb#717) * PHP * Add "readonly" as a keyword for PHP and add previous classnames to descriptor pool (#10041) * Python * Make //:protobuf_python and //:well_known_types_py_pb2 public (#10118) * Bazel * Add back a filegroup for :well_known_protos (#10061) OBS-URL: https://build.opensuse.org/request/show/990943 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=123
17 lines
677 B
Diff
17 lines
677 B
Diff
Index: protobuf-21.3/src/google/protobuf/port_def.inc
|
|
===================================================================
|
|
--- protobuf-21.3.orig/src/google/protobuf/port_def.inc
|
|
+++ protobuf-21.3/src/google/protobuf/port_def.inc
|
|
@@ -652,7 +652,11 @@
|
|
#define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]]
|
|
#define PROTOBUF_CONSTEXPR constexpr
|
|
#elif PROTOBUF_GNUC_MIN(12, 2)
|
|
+#if PROTOBUF_CPLUSPLUS_MIN(201703L)
|
|
#define PROTOBUF_CONSTINIT __constinit
|
|
+#else
|
|
+#define PROTOBUF_CONSTINIT
|
|
+#endif
|
|
#define PROTOBUF_CONSTEXPR constexpr
|
|
// MSVC 17 currently seems to raise an error about constant-initialized pointers.
|
|
#elif defined(_MSC_VER) && _MSC_VER >= 1930
|