1 files changed, 7 insertions, 9 deletions
diff --git a/heuristic_ensemble_matcher.cc b/heuristic_ensemble_matcher.cc
index c812cb4..2f01d34 100644
--- a/heuristic_ensemble_matcher.cc
+++ b/heuristic_ensemble_matcher.cc
@@ -83,6 +83,8 @@ std::ostream& operator<<(std::ostream& stream, const Element& elt) {
 class MatchingInfoOut {
  protected:
   MatchingInfoOut() = default;
+  MatchingInfoOut(const MatchingInfoOut&) = delete;
+  const MatchingInfoOut& operator=(const MatchingInfoOut&) = delete;
 
  public:
   virtual ~MatchingInfoOut() = default;
@@ -108,9 +110,6 @@ class MatchingInfoOut {
   virtual void OutputScores(const std::string& stats) {}
 
   virtual void OutputTextGrid() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MatchingInfoOut);
 };
 
 /******** MatchingInfoTerse ********/
@@ -119,14 +118,13 @@ class MatchingInfoOut {
 class MatchingInfoOutTerse : public MatchingInfoOut {
  public:
   MatchingInfoOutTerse() = default;
+  MatchingInfoOutTerse(const MatchingInfoOutTerse&) = delete;
+  const MatchingInfoOutTerse& operator=(const MatchingInfoOutTerse&) = delete;
   ~MatchingInfoOutTerse() override = default;
 
   void OutputScores(const std::string& stats) override {
     LOG(INFO) << "Best dists: " << stats;
   }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MatchingInfoOutTerse);
 };
 
 /******** MatchingInfoOutVerbose ********/
@@ -137,6 +135,9 @@ class MatchingInfoOutTerse : public MatchingInfoOut {
 class MatchingInfoOutVerbose : public MatchingInfoOut {
  public:
   explicit MatchingInfoOutVerbose(std::ostream& out) : out_(out) {}
+  MatchingInfoOutVerbose(const MatchingInfoOutVerbose&) = delete;
+  const MatchingInfoOutVerbose& operator=(const MatchingInfoOutVerbose&) =
+      delete;
   ~MatchingInfoOutVerbose() override = default;
 
   // Outputs sizes and initializes |text_grid_|.
@@ -226,9 +227,6 @@ class MatchingInfoOutVerbose : public MatchingInfoOut {
 
   // For each "new" element, distance of best match. -1 denotes no match.
   std::vector<double> best_dist_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MatchingInfoOutVerbose);
 };
 
 }  // namespace