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 /imposed_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 'imposed_ensemble_matcher.h')
| -rw-r--r-- | imposed_ensemble_matcher.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/imposed_ensemble_matcher.h b/imposed_ensemble_matcher.h index 4dfc38e..39b0df5 100644 --- a/imposed_ensemble_matcher.h +++ b/imposed_ensemble_matcher.h @@ -10,7 +10,6 @@ #include <string> #include <vector> -#include "base/macros.h" #include "components/zucchini/buffer_view.h" #include "components/zucchini/element_detection.h" #include "components/zucchini/ensemble_matcher.h" @@ -34,6 +33,8 @@ class ImposedMatchParser { }; ImposedMatchParser(); + ImposedMatchParser(const ImposedMatchParser&) = delete; + const ImposedMatchParser& operator=(const ImposedMatchParser&) = delete; ~ImposedMatchParser(); // Parses |imposed_matches| and writes the results to member variables. @@ -57,8 +58,6 @@ class ImposedMatchParser { // unsupported image types (which will simply be ignored). Note that imposing // matches for known but incompatible image types would result in error. std::vector<ElementMatch> bad_matches_; - - DISALLOW_COPY_AND_ASSIGN(ImposedMatchParser); }; // An ensemble matcher that parses a format string that describes matches. @@ -67,6 +66,9 @@ class ImposedEnsembleMatcher : public EnsembleMatcher { // |imposed_matches| specifies imposed maches, using a format described below. // Validation is performed in RunMatch(). explicit ImposedEnsembleMatcher(const std::string& imposed_matches); + ImposedEnsembleMatcher(const ImposedEnsembleMatcher&) = delete; + const ImposedEnsembleMatcher& operator=(const ImposedEnsembleMatcher&) = + delete; ~ImposedEnsembleMatcher() override; // EnsembleMatcher: @@ -74,8 +76,6 @@ class ImposedEnsembleMatcher : public EnsembleMatcher { private: const std::string imposed_matches_; - - DISALLOW_COPY_AND_ASSIGN(ImposedEnsembleMatcher); }; } // namespace zucchini |