From cd69f2ed37d47802c41651e30d27c5cb3ee5e36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wilken=20D=C3=B6rrie?= Date: Wed, 13 May 2020 19:42:11 +0000 Subject: [PATCH] [base] Minor C++17 Fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change performs minor fixes for compilation errors with -std=c++17. They include fully specifying as_const within base::circular_deque, as well as consistent application of the noexcept keyword across declaration and definition of functions. TBR=dcheng Bug: 752720 Change-Id: I3f42d53eefea265c7b16579a12bd4cf29dad6e51 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2199111 Commit-Queue: Jan Wilken Dörrie Reviewed-by: Daniel Cheng Cr-Commit-Position: refs/heads/master@{#768405} --- base/containers/circular_deque.h | 4 ++-- chrome/browser/web_applications/web_app.cc | 6 +++--- chrome/common/web_application_info.cc | 4 ++-- components/paint_preview/browser/paint_preview_client.cc | 4 ++-- components/query_tiles/tile.cc | 4 ++-- pdf/pdfium/pdfium_test_base.cc | 7 ++++--- services/network/network_context.cc | 3 +-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/base/containers/circular_deque.h b/base/containers/circular_deque.h index 07476d29ce5734..6c2c3a885a6876 100644 --- a/base/containers/circular_deque.h +++ b/base/containers/circular_deque.h @@ -522,11 +522,11 @@ class circular_deque { return buffer_[i - right_size]; } value_type& at(size_type i) { - return const_cast(as_const(*this).at(i)); + return const_cast(base::as_const(*this).at(i)); } value_type& operator[](size_type i) { - return const_cast(as_const(*this)[i]); + return const_cast(base::as_const(*this)[i]); } const value_type& operator[](size_type i) const { return at(i); } diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 1f63cb90ae0b17..b31756f3ac1ac1 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -194,7 +194,7 @@ WebApp::WebAppShortcutMenuItemInfo::WebAppShortcutMenuItemInfo( const WebAppShortcutMenuItemInfo& other) = default; WebApp::WebAppShortcutMenuItemInfo::WebAppShortcutMenuItemInfo( - WebAppShortcutMenuItemInfo&&) = default; + WebAppShortcutMenuItemInfo&&) noexcept = default; WebApp::WebAppShortcutMenuItemInfo::~WebAppShortcutMenuItemInfo() = default; @@ -203,8 +203,8 @@ WebApp::WebAppShortcutMenuItemInfo::operator=( const WebAppShortcutMenuItemInfo&) = default; WebApp::WebAppShortcutMenuItemInfo& -WebApp::WebAppShortcutMenuItemInfo::operator=(WebAppShortcutMenuItemInfo&&) = - default; +WebApp::WebAppShortcutMenuItemInfo::operator=( + WebAppShortcutMenuItemInfo&&) noexcept = default; void WebApp::SetSyncData(SyncData sync_data) { sync_data_ = std::move(sync_data); diff --git a/chrome/common/web_application_info.cc b/chrome/common/web_application_info.cc index b0f9b3c5f30203..09cef123bff6f1 100644 --- a/chrome/common/web_application_info.cc +++ b/chrome/common/web_application_info.cc @@ -26,7 +26,7 @@ WebApplicationShortcutInfo::WebApplicationShortcutInfo( const WebApplicationShortcutInfo& other) = default; WebApplicationShortcutInfo::WebApplicationShortcutInfo( - WebApplicationShortcutInfo&&) = default; + WebApplicationShortcutInfo&&) noexcept = default; WebApplicationShortcutInfo::~WebApplicationShortcutInfo() = default; @@ -34,7 +34,7 @@ WebApplicationShortcutInfo& WebApplicationShortcutInfo::operator=( const WebApplicationShortcutInfo&) = default; WebApplicationShortcutInfo& WebApplicationShortcutInfo::operator=( - WebApplicationShortcutInfo&&) = default; + WebApplicationShortcutInfo&&) noexcept = default; WebApplicationInfo::WebApplicationInfo() : mobile_capable(MOBILE_CAPABLE_UNSPECIFIED), diff --git a/components/paint_preview/browser/paint_preview_client.cc b/components/paint_preview/browser/paint_preview_client.cc index e720afed2308fe..35dec779664579 100644 --- a/components/paint_preview/browser/paint_preview_client.cc +++ b/components/paint_preview/browser/paint_preview_client.cc @@ -104,8 +104,8 @@ PaintPreviewClient::PaintPreviewData::PaintPreviewData() = default; PaintPreviewClient::PaintPreviewData::~PaintPreviewData() = default; PaintPreviewClient::PaintPreviewData& -PaintPreviewClient::PaintPreviewData::operator=(PaintPreviewData&& rhs) = - default; +PaintPreviewClient::PaintPreviewData::operator=( + PaintPreviewData&& rhs) noexcept = default; PaintPreviewClient::PaintPreviewData::PaintPreviewData( PaintPreviewData&& other) noexcept = default; diff --git a/components/query_tiles/tile.cc b/components/query_tiles/tile.cc index 9ae04aa09c6567..8f8482eff2906d 100644 --- a/components/query_tiles/tile.cc +++ b/components/query_tiles/tile.cc @@ -57,7 +57,7 @@ Tile::Tile(const Tile& other) { Tile::Tile() = default; -Tile::Tile(Tile&& other) = default; +Tile::Tile(Tile&& other) noexcept = default; Tile::~Tile() = default; @@ -66,6 +66,6 @@ Tile& Tile::operator=(const Tile& other) { return *this; } -Tile& Tile::operator=(Tile&& other) = default; +Tile& Tile::operator=(Tile&& other) noexcept = default; } // namespace upboarding diff --git a/pdf/pdfium/pdfium_test_base.cc b/pdf/pdfium/pdfium_test_base.cc index 679ba416aaf74c..293c8e3cad344a 100644 --- a/pdf/pdfium/pdfium_test_base.cc +++ b/pdf/pdfium/pdfium_test_base.cc @@ -114,10 +114,11 @@ PDFiumPage* PDFiumTestBase::GetPDFiumPageForTest(PDFiumEngine* engine, PDFiumTestBase::InitializeEngineResult::InitializeEngineResult() = default; PDFiumTestBase::InitializeEngineResult::InitializeEngineResult( - InitializeEngineResult&& other) = default; + InitializeEngineResult&& other) noexcept = default; -PDFiumTestBase::InitializeEngineResult& PDFiumTestBase::InitializeEngineResult:: -operator=(InitializeEngineResult&& other) = default; +PDFiumTestBase::InitializeEngineResult& +PDFiumTestBase::InitializeEngineResult::operator=( + InitializeEngineResult&& other) noexcept = default; PDFiumTestBase::InitializeEngineResult::~InitializeEngineResult() = default; diff --git a/services/network/network_context.cc b/services/network/network_context.cc index 490fbca4aa81f8..9ab498142f40e3 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc @@ -1624,8 +1624,7 @@ void NetworkContext::LookupServerBasicAuthCredentials( std::move(callback).Run(base::nullopt); } -const net::HttpAuthPreferences* NetworkContext::GetHttpAuthPreferences() const - noexcept { +const net::HttpAuthPreferences* NetworkContext::GetHttpAuthPreferences() const { return &http_auth_merged_preferences_; }