mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-20 09:17:43 +03:00
6326822907
* Upgrade grpc and protobuf libraries changelog_begin - [Dependencies] Upgrade iou.grpc:grpc-(api|core|netty|protobuf|services|stub) to 1.35.0. - [Dependencies] Upgrade io.netty:netty-(codec-http2|handler|handler-proxy|resolver) to 4.1.58.Final. - [Dependencies] Upgrade io.netty:netty-tcnative-boringssl-static to 2.0.36.Final. - [Dependencies] Upgrade com.google.protobuf:protobuf-java to 3.14.0. changelog_end * Factor out netty and grpc version changelog_begin changelog_end
19 lines
762 B
Diff
19 lines
762 B
Diff
# See https://github.com/protocolbuffers/protobuf/issues/8049
|
|
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
|
|
index 320e888ec..e24b8808c 100644
|
|
--- a/src/google/protobuf/port_def.inc
|
|
+++ b/src/google/protobuf/port_def.inc
|
|
@@ -560,10 +560,10 @@
|
|
#define PROTOBUF_CONSTINIT
|
|
#endif
|
|
|
|
-// Some constructors can't be constexpr under MSVC, but given that MSVC will not
|
|
+// Some constructors can't be constexpr under Windows, but given that Windows will not
|
|
// do constant initialization of globals anyway we can omit `constexpr` from
|
|
// them. These constructors are marked with PROTOBUF_MAYBE_CONSTEXPR
|
|
-#if defined(_MSC_VER)
|
|
+#if defined(_WIN32)
|
|
#define PROTOBUF_MAYBE_CONSTEXPR
|
|
#else
|
|
#define PROTOBUF_MAYBE_CONSTEXPR constexpr
|