summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-17 12:02:55 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-02-05 17:20:52 +0100
commit3b28d7c9066d5c08514a4bcd1d063ea2de0c6df3 (patch)
treed4ddc28b72a2ffa4928872c4f389bca5e9987295
parent087164f9bfda2f54519607ef5872317e7b67ce87 (diff)
downloadqtwebengine-chromium-3b28d7c9066d5c08514a4bcd1d063ea2de0c6df3.tar.gz
Work-around GCC bug
Somehow the default generated move in this case isn't noexcept. (Triggers on RHEL_7_6) Change-Id: Id71a6e63b8261112000945688ac1666a7b474a78 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--chromium/gpu/config/gpu_info.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/chromium/gpu/config/gpu_info.cc b/chromium/gpu/config/gpu_info.cc
index 91cf6c1090e..717eac001d0 100644
--- a/chromium/gpu/config/gpu_info.cc
+++ b/chromium/gpu/config/gpu_info.cc
@@ -173,7 +173,17 @@ GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=(
const GPUInfo::GPUDevice& other) = default;
GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=(
- GPUInfo::GPUDevice&& other) noexcept = default;
+ GPUInfo::GPUDevice&& other) noexcept {
+ vendor_id = other.vendor_id;
+ device_id = other.device_id;
+ active = other.active;
+ vendor_string = std::move(other.vendor_string);
+ device_string = std::move(other.device_string);
+ driver_vendor = std::move(other.driver_vendor);
+ driver_version = std::move(other.driver_version);
+ driver_date = std::move(other.driver_date);
+ return *this;
+}
GPUInfo::GPUInfo()
: optimus(false),