summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-06-20 17:43:09 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-06-21 10:53:09 +0000
commit56201f1b747100508b0782ccb4c66b79ce0065f9 (patch)
tree27c1be8f1a4a4f9aac7ef584d3041b213a04829a
parent388a149c434d668423e987df728f26f942e28cf8 (diff)
downloadqtwebengine-chromium-56201f1b747100508b0782ccb4c66b79ce0065f9.tar.gz
FIXUP: Fix building on macOS with Xcode
Change-Id: Ib183503d8f1113a631de02aad79174c8b7b475b3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--chromium/content/browser/webauth/scoped_virtual_authenticator_environment.cc2
-rw-r--r--chromium/third_party/pdfium/core/fxcrt/string_view_template.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/chromium/content/browser/webauth/scoped_virtual_authenticator_environment.cc b/chromium/content/browser/webauth/scoped_virtual_authenticator_environment.cc
index 630260d0cf8..ca8c8b97830 100644
--- a/chromium/content/browser/webauth/scoped_virtual_authenticator_environment.cc
+++ b/chromium/content/browser/webauth/scoped_virtual_authenticator_environment.cc
@@ -107,7 +107,7 @@ ScopedVirtualAuthenticatorEnvironment::CreateFidoDiscovery(
discovery->AddVirtualDevice(authenticator.second->ConstructDevice());
}
discoveries_.insert(discovery.get());
- return discovery;
+ return std::move(discovery);
}
void ScopedVirtualAuthenticatorEnvironment::OnDiscoveryDestroyed(
diff --git a/chromium/third_party/pdfium/core/fxcrt/string_view_template.h b/chromium/third_party/pdfium/core/fxcrt/string_view_template.h
index b25f9ee6f8c..859a13b746f 100644
--- a/chromium/third_party/pdfium/core/fxcrt/string_view_template.h
+++ b/chromium/third_party/pdfium/core/fxcrt/string_view_template.h
@@ -81,7 +81,10 @@ class StringViewTemplate {
return *this;
}
- StringViewTemplate& operator=(const StringViewTemplate& src) = default;
+ StringViewTemplate& operator=(const StringViewTemplate& src) {
+ m_Span = src.m_Span;
+ return *this;
+ }
const_iterator begin() const {
return reinterpret_cast<const_iterator>(m_Span.begin());