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