diff options
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 |