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 /heuristic_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 'heuristic_ensemble_matcher.h')
| -rw-r--r-- | heuristic_ensemble_matcher.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/heuristic_ensemble_matcher.h b/heuristic_ensemble_matcher.h index 1adb998..ec40787 100644 --- a/heuristic_ensemble_matcher.h +++ b/heuristic_ensemble_matcher.h @@ -7,7 +7,6 @@ #include <ostream> -#include "base/macros.h" #include "components/zucchini/buffer_view.h" #include "components/zucchini/ensemble_matcher.h" @@ -22,6 +21,9 @@ namespace zucchini { class HeuristicEnsembleMatcher : public EnsembleMatcher { public: explicit HeuristicEnsembleMatcher(std::ostream* out); + HeuristicEnsembleMatcher(const HeuristicEnsembleMatcher&) = delete; + const HeuristicEnsembleMatcher& operator=(const HeuristicEnsembleMatcher&) = + delete; ~HeuristicEnsembleMatcher() override; // EnsembleMatcher: @@ -30,8 +32,6 @@ class HeuristicEnsembleMatcher : public EnsembleMatcher { private: // Optional stream to print detailed information during matching. std::ostream* out_ = nullptr; - - DISALLOW_COPY_AND_ASSIGN(HeuristicEnsembleMatcher); }; } // namespace zucchini |