v0.2.49..v0.2.50 changeset ScriptMergerCreator.h
Garret Voltz edited this page Nov 6, 2019
·
1 revision
diff --git a/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMergerCreator.h b/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMergerCreator.h
index 51339ad..5441488 100644
--- a/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMergerCreator.h
+++ b/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMergerCreator.h
@@ -46,11 +46,11 @@ public:
/**
* If all the matches are CustomPoiMatches, a single CustomPoiMerger will be created and returned.
*/
- 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;
};