diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/containers/flat_tree.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/containers/flat_tree.h')
| -rw-r--r-- | chromium/base/containers/flat_tree.h | 7 |
1 files changed, 5 insertions, 2 deletions
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<underlying_type>::value); // Takes the first if there are duplicates in the initializer list. flat_tree& operator=(std::initializer_list<value_type> ilist); @@ -518,7 +519,9 @@ auto flat_tree<Key, Value, GetKeyFromValue, KeyCompare>::operator=( const flat_tree&) -> flat_tree& = default; template <class Key, class Value, class GetKeyFromValue, class KeyCompare> -auto flat_tree<Key, Value, GetKeyFromValue, KeyCompare>::operator=(flat_tree &&) +auto flat_tree<Key, Value, GetKeyFromValue, KeyCompare>:: +operator=(flat_tree&&) noexcept( + std::is_nothrow_move_assignable<underlying_type>::value) -> flat_tree& = default; template <class Key, class Value, class GetKeyFromValue, class KeyCompare> |