v0.2.49..v0.2.50 changeset MultiaryPoiMergerCreator.h
Garret Voltz edited this page Nov 6, 2019
·
1 revision
diff --git a/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerCreator.h b/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerCreator.h
index 01e3ecd..fa653e7 100644
--- a/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerCreator.h
+++ b/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerCreator.h
@@ -63,14 +63,14 @@ public:
* This merger is very aggressive and will merge pretty much any set of matches that are passed
* in. This should generally be the last merger.
*/
- virtual bool createMergers(const MatchSet& matches, std::vector<Merger*>& mergers) const override;
+ virtual bool createMergers(const MatchSet& matches, std::vector<MergerPtr>& mergers) const override;
/**
* Returns a description of this merger creator.
*/
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;
};
}