Prepare master for new framework integration

[AGL/meta-agl-demo.git] / recipes-wam / chromium / files / chromium-quiche-invalid-offsetof.patch

diff --git a/recipes-wam/chromium/files/chromium-quiche-invalid-offsetof.patch b/recipes-wam/chromium/files/chromium-quiche-invalid-offsetof.patch
deleted file mode 100644 (file)
index 4fdd98d..0000000
--- a/recipes-wam/chromium/files/chromium-quiche-invalid-offsetof.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 4cea86e76af28b28aa72cb7c69ff7cf242b2bd5d Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 27 Jun 2020 12:18:05 +0000
-Subject: [PATCH] GCC: supress invalid-offsetof warning
-
-GCC emits a warning if offsetof is used for non-POD
-types. However, GCC supports this and prints only
-the warning, because it might be nonportable code.
-Disable the warning for GCC with a pragma.
----
- src/net/third_party/quiche/src/quic/core/frames/quic_frame.h   | 7 +++++++
- .../quiche/src/quic/core/frames/quic_inlined_frame.h       | 7 +++++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/src/net/third_party/quiche/src/quic/core/frames/quic_frame.h b/src/net/third_party/quiche/src/quic/core/frames/quic_frame.h
-index 756b69f..aceba76 100644
---- a/src/net/third_party/quiche/src/quic/core/frames/quic_frame.h
-+++ b/src/net/third_party/quiche/src/quic/core/frames/quic_frame.h
-@@ -110,8 +110,15 @@ struct QUIC_EXPORT_PRIVATE QuicFrame {
- 
- static_assert(sizeof(QuicFrame) <= 24,
-               "Frames larger than 24 bytes should be referenced by pointer.");
-+#if defined(__GNUC__)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Winvalid-offsetof"
-+#endif
- static_assert(offsetof(QuicStreamFrame, type) == offsetof(QuicFrame, type),
-               "Offset of |type| must match in QuicFrame and QuicStreamFrame");
-+#if defined(__GNUC__)
-+#pragma GCC diagnostic pop
-+#endif
- 
- // A inline size of 1 is chosen to optimize the typical use case of
- // 1-stream-frame in QuicTransmissionInfo.retransmittable_frames.
-diff --git a/src/net/third_party/quiche/src/quic/core/frames/quic_inlined_frame.h b/src/net/third_party/quiche/src/quic/core/frames/quic_inlined_frame.h
-index 08c4869..804e4bb 100644
---- a/src/net/third_party/quiche/src/quic/core/frames/quic_inlined_frame.h
-+++ b/src/net/third_party/quiche/src/quic/core/frames/quic_inlined_frame.h
-@@ -17,8 +17,15 @@ namespace quic {
- template <typename DerivedT>
- struct QUIC_EXPORT_PRIVATE QuicInlinedFrame {
-   QuicInlinedFrame(QuicFrameType type) : type(type) {
-+#if defined(__GNUC__)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Winvalid-offsetof"
-+#endif
-     static_assert(offsetof(DerivedT, type) == 0,
-                   "type must be the first field.");
-+#if defined(__GNUC__)
-+#pragma GCC diagnostic pop
-+#endif
-     static_assert(sizeof(DerivedT) <= 24,
-                   "Frames larger than 24 bytes should not be inlined.");
-   }
--- 
-2.26.2
-