Skip to content

v0.2.49..v0.2.50 changeset MarkForReviewMergerCreator.h

Garret Voltz edited this page Nov 6, 2019 · 1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/merging/MarkForReviewMergerCreator.h b/hoot-core/src/main/cpp/hoot/core/conflate/merging/MarkForReviewMergerCreator.h
index beaca88..28135da 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/merging/MarkForReviewMergerCreator.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/merging/MarkForReviewMergerCreator.h
@@ -41,11 +41,11 @@ public:
 
   MarkForReviewMergerCreator();
 
-  virtual bool createMergers(const MatchSet& matches, std::vector<Merger*>& mergers) const override;
+  virtual bool createMergers(const MatchSet& matches, std::vector<MergerPtr>& mergers) const override;
 
   virtual std::vector<CreatorDescription> getAllCreators() const override;
 
-  virtual bool isConflicting(const ConstOsmMapPtr& map, const Match* m1, const Match* m2) const;
+  virtual bool isConflicting(const ConstOsmMapPtr& map, ConstMatchPtr m1, ConstMatchPtr m2) const override;
 };
 
 }
Clone this wiki locally