From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/base/containers/flat_tree.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'chromium/base/containers/flat_tree.h') diff --git a/chromium/base/containers/flat_tree.h b/chromium/base/containers/flat_tree.h index 9412ff6af74..ce6e92b4d36 100644 --- a/chromium/base/containers/flat_tree.h +++ b/chromium/base/containers/flat_tree.h @@ -125,7 +125,8 @@ class flat_tree { // Assume that move assignment invalidates iterators and references. flat_tree& operator=(const flat_tree&); - flat_tree& operator=(flat_tree&&); + flat_tree& operator=(flat_tree&&) noexcept( + std::is_nothrow_move_assignable::value); // Takes the first if there are duplicates in the initializer list. flat_tree& operator=(std::initializer_list ilist); @@ -518,7 +519,9 @@ auto flat_tree::operator=( const flat_tree&) -> flat_tree& = default; template -auto flat_tree::operator=(flat_tree &&) +auto flat_tree:: +operator=(flat_tree&&) noexcept( + std::is_nothrow_move_assignable::value) -> flat_tree& = default; template -- cgit v1.2.1