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_map.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
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_map.h')
| -rw-r--r-- | chromium/base/containers/flat_map.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/base/containers/flat_map.h b/chromium/base/containers/flat_map.h index ed82c5d516c..4a0def5a378 100644 --- a/chromium/base/containers/flat_map.h +++ b/chromium/base/containers/flat_map.h @@ -9,8 +9,8 @@ #include <tuple> #include <utility> +#include "base/check.h" #include "base/containers/flat_tree.h" -#include "base/logging.h" #include "base/template_util.h" namespace base { @@ -202,7 +202,7 @@ class flat_map : public ::base::internal::flat_tree< ~flat_map() = default; flat_map& operator=(const flat_map&) = default; - flat_map& operator=(flat_map&&) = default; + flat_map& operator=(flat_map&&) noexcept = default; // Takes the first if there are duplicates in the initializer list. flat_map& operator=(std::initializer_list<value_type> ilist); |