diff options
| author | Samuel Huang <huangs@chromium.org> | 2021-08-13 15:42:26 +0000 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-08-13 08:54:54 -0700 |
| commit | f137bf4b5542b966abc4c08762c5e60b21913f4d (patch) | |
| tree | 09c6bdbdfaa7dd2f09d32a791a6aa364b0eeb2ba /ensemble_matcher.h | |
| parent | fa10b05c4854c6d8a603ee47c2a213cbc23f8646 (diff) | |
| download | zucchini-f137bf4b5542b966abc4c08762c5e60b21913f4d.tar.gz | |
[Zucchini] Replace DISALLOW_* macros with =delete versions.
This CL replaces
* 30 instances of DISALLOW_COPY_AND_ASSIGN(Foo),
* 1 instance of DISALLOW_IMPLICIT_CONSTRUCTORS(Foo),
in Zucchini with:
Foo() = delete; // DISALLOW_IMPLICIT_CONSTRUCTORS only.
Foo(const Foo&) = delete;
const Foo& operator=(const Foo&) = delete;
All base/macros.h includes are removed.
Bug: 1010217
Change-Id: I13b3d5ed04f04e5c0b209d59e70ac018c5f4938c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3093198
Reviewed-by: Etienne Pierre-Doray <etiennep@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#911751}
NOKEYCHECK=True
GitOrigin-RevId: ba0e1f56993c535faa59e2ca02c371bae2ebbb20
Diffstat (limited to 'ensemble_matcher.h')
| -rw-r--r-- | ensemble_matcher.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ensemble_matcher.h b/ensemble_matcher.h index bc89883..b188657 100644 --- a/ensemble_matcher.h +++ b/ensemble_matcher.h @@ -9,7 +9,6 @@ #include <vector> -#include "base/macros.h" #include "components/zucchini/buffer_view.h" #include "components/zucchini/element_detection.h" #include "components/zucchini/image_utils.h" @@ -29,6 +28,8 @@ namespace zucchini { class EnsembleMatcher { public: EnsembleMatcher(); + EnsembleMatcher(const EnsembleMatcher&) = delete; + const EnsembleMatcher& operator=(const EnsembleMatcher&) = delete; virtual ~EnsembleMatcher(); // Interface to main matching feature. Returns whether match was successful. @@ -52,9 +53,6 @@ class EnsembleMatcher { // Number of identical matches found in match candidates. These should be // excluded from |matches_|. size_t num_identical_ = 0; - - private: - DISALLOW_COPY_AND_ASSIGN(EnsembleMatcher); }; } // namespace zucchini |