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/id_map.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/id_map.h')
| -rw-r--r-- | chromium/base/containers/id_map.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chromium/base/containers/id_map.h b/chromium/base/containers/id_map.h index 4c816da3767..4caf8a2e2d3 100644 --- a/chromium/base/containers/id_map.h +++ b/chromium/base/containers/id_map.h @@ -14,9 +14,9 @@ #include <unordered_map> #include <utility> +#include "base/check_op.h" #include "base/containers/flat_set.h" -#include "base/logging.h" -#include "base/macros.h" +#include "base/notreached.h" #include "base/sequence_checker.h" namespace base { @@ -51,6 +51,9 @@ class IDMap final { DETACH_FROM_SEQUENCE(sequence_checker_); } + IDMap(const IDMap&) = delete; + IDMap& operator=(const IDMap&) = delete; + ~IDMap() { // Many IDMap's are static, and hence will be destroyed on the main // thread. However, all the accesses may take place on another thread (or @@ -281,8 +284,6 @@ class IDMap final { bool check_on_null_data_; SEQUENCE_CHECKER(sequence_checker_); - - DISALLOW_COPY_AND_ASSIGN(IDMap); }; } // namespace base |