parent
168b7d76d4
commit
dc623b18d2
@ -1,84 +0,0 @@
|
||||
From 96f354df27c2f3c7c1b221b676c7a1af6b3da375 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 02/29] Fix build with GCC 8.1.0
|
||||
|
||||
Task-number: QTBUG-68203
|
||||
Change-Id: I780d884d5e20ef04e902d7b449da4aa3f97d8d0b
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
---
|
||||
.../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();
|
||||
--
|
||||
2.17.1
|
||||
|
@ -1 +1 @@
|
||||
SHA512 (qtwebengine-everywhere-src-5.11.0-clean.tar.xz) = fb6a9a047e77478f6ea9bc9cdb4c7ea05520e9b2919a346d39e7eb09bd88747e35a97ef41bfa06aaed8eb9c3db9372c17dc4e24d1ed2e734f9bf6f58783c4616
|
||||
SHA512 (qtwebengine-everywhere-src-5.11.1-clean.tar.xz) = 59e9ea806e81ca56c858b7f391fd9c27ea889090e3c6f6168ffea6bd13fd2f78f7301b1f4487a79dea2ea48066fa657cd53a1d8c584258e4738b9030b970aea4
|
||||
|
Loading…
Reference in new issue