diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Fix-build-with-GCC-8.1.0.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Fix-build-with-GCC-8.1.0.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Fix-build-with-GCC-8.1.0.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Fix-build-with-GCC-8.1.0.patch new file mode 100644 index 00000000..297700be --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Fix-build-with-GCC-8.1.0.patch | |||
@@ -0,0 +1,83 @@ | |||
1 | From e8df2acf2ce52972b2ed2596f2ca6dac8656eded Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io> | ||
3 | Date: Mon, 14 May 2018 10:15:50 +0200 | ||
4 | Subject: [PATCH] chromium: Fix build with GCC 8.1.0 | ||
5 | |||
6 | Task-number: QTBUG-68203 | ||
7 | Change-Id: I780d884d5e20ef04e902d7b449da4aa3f97d8d0b | ||
8 | Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> | ||
9 | |||
10 | Upstream-Status: Backport (from newer 65-based revision) | ||
11 | --- | ||
12 | .../mojo/public/cpp/bindings/associated_interface_ptr_info.h | 2 +- | ||
13 | .../mojo/public/cpp/bindings/associated_interface_request.h | 2 +- | ||
14 | chromium/mojo/public/cpp/bindings/interface_request.h | 2 +- | ||
15 | .../mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h | 2 ++ | ||
16 | chromium/mojo/public/cpp/system/handle.h | 2 +- | ||
17 | 5 files changed, 6 insertions(+), 4 deletions(-) | ||
18 | |||
19 | diff --git a/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h b/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h | ||
20 | index 1f79662bd7..184ba6a9e8 100644 | ||
21 | --- a/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h | ||
22 | +++ b/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h | ||
23 | @@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo { | ||
24 | |||
25 | bool is_valid() const { return handle_.is_valid(); } | ||
26 | |||
27 | - explicit operator bool() const { return handle_; } | ||
28 | + explicit operator bool() const { return !!handle_; } | ||
29 | |||
30 | ScopedInterfaceEndpointHandle PassHandle() { | ||
31 | return std::move(handle_); | ||
32 | diff --git a/chromium/mojo/public/cpp/bindings/associated_interface_request.h b/chromium/mojo/public/cpp/bindings/associated_interface_request.h | ||
33 | index 12d2f3ce1d..fcdc2b9321 100644 | ||
34 | --- a/chromium/mojo/public/cpp/bindings/associated_interface_request.h | ||
35 | +++ b/chromium/mojo/public/cpp/bindings/associated_interface_request.h | ||
36 | @@ -50,7 +50,7 @@ class AssociatedInterfaceRequest { | ||
37 | // handle. | ||
38 | bool is_pending() const { return handle_.is_valid(); } | ||
39 | |||
40 | - explicit operator bool() const { return handle_; } | ||
41 | + explicit operator bool() const { return !!handle_; } | ||
42 | |||
43 | ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); } | ||
44 | |||
45 | diff --git a/chromium/mojo/public/cpp/bindings/interface_request.h b/chromium/mojo/public/cpp/bindings/interface_request.h | ||
46 | index 1007cb0b8c..da1f3244a3 100644 | ||
47 | --- a/chromium/mojo/public/cpp/bindings/interface_request.h | ||
48 | +++ b/chromium/mojo/public/cpp/bindings/interface_request.h | ||
49 | @@ -54,7 +54,7 @@ class InterfaceRequest { | ||
50 | // Indicates whether the request currently contains a valid message pipe. | ||
51 | bool is_pending() const { return handle_.is_valid(); } | ||
52 | |||
53 | - explicit operator bool() const { return handle_; } | ||
54 | + explicit operator bool() const { return !!handle_; } | ||
55 | |||
56 | // Removes the message pipe from the request and returns it. | ||
57 | ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); } | ||
58 | diff --git a/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h b/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h | ||
59 | index 5d00e5019e..ef8a927ba6 100644 | ||
60 | --- a/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h | ||
61 | +++ b/chromium/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h | ||
62 | @@ -45,6 +45,8 @@ class MOJO_CPP_BINDINGS_EXPORT ScopedInterfaceEndpointHandle { | ||
63 | |||
64 | bool is_valid() const; | ||
65 | |||
66 | + explicit operator bool() const { return is_valid(); } | ||
67 | + | ||
68 | // Returns true if the interface hasn't associated with a message pipe. | ||
69 | bool pending_association() const; | ||
70 | |||
71 | diff --git a/chromium/mojo/public/cpp/system/handle.h b/chromium/mojo/public/cpp/system/handle.h | ||
72 | index 7c886e8825..c9f9e961db 100644 | ||
73 | --- a/chromium/mojo/public/cpp/system/handle.h | ||
74 | +++ b/chromium/mojo/public/cpp/system/handle.h | ||
75 | @@ -121,7 +121,7 @@ class ScopedHandleBase { | ||
76 | |||
77 | bool is_valid() const { return handle_.is_valid(); } | ||
78 | |||
79 | - explicit operator bool() const { return handle_; } | ||
80 | + explicit operator bool() const { return !!handle_; } | ||
81 | |||
82 | bool operator==(const ScopedHandleBase& other) const { | ||
83 | return handle_.value() == other.get().value(); | ||